From 779f967449bf0fed7c005dc487949230a2e523a0 Mon Sep 17 00:00:00 2001 From: Hareesh MS Date: Tue, 2 Jul 2024 12:24:03 +0000 Subject: [PATCH 1/8] US NTSB Crash NL embeddings --- deploy/nl/catalog.yaml | 2 +- .../query_1/chart_config.json | 921 +----------------- .../whatisthephylumofvolvox/debug_info.json | 74 +- .../debug_info.json | 78 +- .../debug_info.json | 80 +- .../compareobesityvs.poverty/debug_info.json | 64 +- .../debug_info.json | 82 +- .../debug_info.json | 94 +- .../debug_info.json | 46 +- tools/nl/embeddings/input/base/_preindex.csv | 8 + tools/nl/embeddings/input/base/sheets_svs.csv | 8 + 11 files changed, 300 insertions(+), 1157 deletions(-) diff --git a/deploy/nl/catalog.yaml b/deploy/nl/catalog.yaml index f29d19b70f..53bd4f5c1d 100644 --- a/deploy/nl/catalog.yaml +++ b/deploy/nl/catalog.yaml @@ -90,7 +90,7 @@ indexes: base_uae_mem: store_type: MEMORY source_path: ../../tools/nl/embeddings/input/base - embeddings_path: gs://datcom-nl-models/base_uae_mem_2024_07_01_20_18_36/embeddings.csv + embeddings_path: gs://datcom-nl-models/base_uae_mem_2024_07_02_08_45_24/embeddings.csv model: uae-large-v1-model healthcheck_query: "Life expectancy" base_mistral_mem: diff --git a/server/integration_tests/test_data/demo_climatetrace/query_1/chart_config.json b/server/integration_tests/test_data/demo_climatetrace/query_1/chart_config.json index 1d2dd2f94f..9ea77332ed 100644 --- a/server/integration_tests/test_data/demo_climatetrace/query_1/chart_config.json +++ b/server/integration_tests/test_data/demo_climatetrace/query_1/chart_config.json @@ -4,137 +4,6 @@ "categories": [ { "blocks": [ - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_Agriculture" - ], - "title": "Greenhouse Gas Emissions From Agriculture in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_Agriculture" - ], - "title": "Greenhouse Gas Emissions From Agriculture in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "description": "Greenhouse gas emissions from the growing of crops and livestock for food and raw materials for non-food consumption (measured in tonnes of CO\u2082 equivalents).", - "title": "Greenhouse Gas Emissions From Agriculture in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_ElectricityGeneration" - ], - "title": "Greenhouse Gas Emissions From Electricity Generation in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_ElectricityGeneration" - ], - "title": "Greenhouse Gas Emissions From Electricity Generation in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "description": "Greenhouse gas emissions from electricity generation (measured in tonnes of CO\u2082 equivalents).", - "title": "Greenhouse Gas Emissions From Electricity Generation in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_GreenhouseGas" - ], - "title": "Greenhouse Gas Emissions in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_GreenhouseGas" - ], - "title": "Greenhouse Gas Emissions in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "description": "Annual emissions from all greenhouse gases measured in tonnes of CO\u2082 equivalents.", - "title": "Greenhouse Gas Emissions in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "eia/INTL.4008-8-MMTCD.A" - ], - "title": "CO2 Emissions, Annual in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "eia/INTL.4008-8-MMTCD.A" - ], - "title": "CO2 Emissions, Annual in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "CO2 Emissions, Annual in the World" - }, { "columns": [ { @@ -164,37 +33,6 @@ "denom": "Count_Person", "title": "CO2 Emissions, Annual" }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Amount_Emissions_CarbonDioxide_PerCapita" - ], - "title": "CO2 Emissions Per Capita in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Amount_Emissions_CarbonDioxide_PerCapita" - ], - "title": "CO2 Emissions Per Capita in the World (${date})", - "type": "MAP" - } - ] - } - ], - "title": "CO2 Emissions Per Capita in the World" - }, { "columns": [ { @@ -223,72 +61,6 @@ ], "title": "CO2 Emissions Per Capita" }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_CarbonDioxide_Agriculture" - ], - "title": "CO\u2082 Emissions From Agriculture in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_CarbonDioxide_Agriculture" - ], - "title": "CO\u2082 Emissions From Agriculture in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "description": "CO\u2082 emissions from the growing of crops and livestock for food and raw materials for non-food consumption (measured in tonnes).", - "title": "CO\u2082 Emissions From Agriculture in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" - ], - "title": "CO\u2082 Emissions From Fuel Combustion in Buildings in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" - ], - "title": "CO\u2082 Emissions From Fuel Combustion in Buildings in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "description": "CO\u2082 emissions from onsite fuel combustion in residential, commercial and institutional buildings (measured in tonnes).", - "title": "CO\u2082 Emissions From Fuel Combustion in Buildings in the World" - }, { "columns": [ { @@ -321,70 +93,6 @@ "denom": "Count_Person", "title": "CO2 Emissions by Source" }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_Methane_Agriculture" - ], - "title": "Annual Amount of Emissions: Agriculture, Methane in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_Methane_Agriculture" - ], - "title": "Annual Amount of Emissions: Agriculture, Methane in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "Annual Amount of Emissions: Agriculture, Methane in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_Methane_FossilFuelOperations" - ], - "title": "Annual Amount of Emissions: Fossil Fuel Operations, Methane in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_Methane_FossilFuelOperations" - ], - "title": "Annual Amount of Emissions: Fossil Fuel Operations, Methane in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "Annual Amount of Emissions: Fossil Fuel Operations, Methane in the World" - }, { "columns": [ { @@ -405,70 +113,6 @@ "denom": "Count_Person", "title": "Methane Emissions by Source" }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_NitrousOxide_Agriculture" - ], - "title": "Annual Amount of Emissions: Agriculture, Nitrous Oxide in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_NitrousOxide_Agriculture" - ], - "title": "Annual Amount of Emissions: Agriculture, Nitrous Oxide in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "Annual Amount of Emissions: Agriculture, Nitrous Oxide in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating" - ], - "title": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating" - ], - "title": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide in the World" - }, { "columns": [ { @@ -498,134 +142,6 @@ ], "denom": "Count_Person", "title": "Nitrous Oxide Emissions by Source" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_FuelCombustionForCooking" - ], - "title": "Annual Amount of Emissions: Fuel Combustion for Cooking, Greenhouse Gas in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_FuelCombustionForCooking" - ], - "title": "Annual Amount of Emissions: Fuel Combustion for Cooking, Greenhouse Gas in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "Annual Amount of Emissions: Fuel Combustion for Cooking, Greenhouse Gas in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_RiceCultivation" - ], - "title": "Annual Amount of Emissions: Rice Cultivation, Greenhouse Gas in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_RiceCultivation" - ], - "title": "Annual Amount of Emissions: Rice Cultivation, Greenhouse Gas in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "Annual Amount of Emissions: Rice Cultivation, Greenhouse Gas in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_OilAndGasProduction" - ], - "title": "Annual Amount of Emissions: Oil and Gas Production, Greenhouse Gas in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_OilAndGasProduction" - ], - "title": "Annual Amount of Emissions: Oil and Gas Production, Greenhouse Gas in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "Annual Amount of Emissions: Oil and Gas Production, Greenhouse Gas in the World" - }, - { - "columns": [ - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 10, - "showHighest": true - }, - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_EntericFermentation" - ], - "title": "Annual Amount of Emissions: Enteric Fermentation, Greenhouse Gas in the World (${date})", - "type": "RANKING" - } - ] - }, - { - "tiles": [ - { - "statVarKey": [ - "Annual_Emissions_GreenhouseGas_EntericFermentation" - ], - "title": "Annual Amount of Emissions: Enteric Fermentation, Greenhouse Gas in the World (${date})", - "type": "MAP" - } - ] - } - ], - "denom": "Count_Person", - "title": "Annual Amount of Emissions: Enteric Fermentation, Greenhouse Gas in the World" } ], "statVarSpec": { @@ -633,10 +149,6 @@ "name": "CO2 Emissions Per Capita", "statVar": "Amount_Emissions_CarbonDioxide_PerCapita" }, - "Annual_Emissions_CarbonDioxide_Agriculture": { - "name": "CO\u2082 Emissions from Agriculture", - "statVar": "Annual_Emissions_CarbonDioxide_Agriculture" - }, "Annual_Emissions_CarbonDioxide_Agriculture_multiple_place_bar_block": { "name": "CO\u2082 Emissions from Agriculture", "statVar": "Annual_Emissions_CarbonDioxide_Agriculture" @@ -645,10 +157,6 @@ "name": "CO\u2082 Emissions from Fossil Fuel Operations", "statVar": "Annual_Emissions_CarbonDioxide_FossilFuelOperations" }, - "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings": { - "name": "CO\u2082 Emissions from Fuel Combustion in Buildings", - "statVar": "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" - }, "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings_multiple_place_bar_block": { "name": "CO\u2082 Emissions from Fuel Combustion in Buildings", "statVar": "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" @@ -673,34 +181,6 @@ "name": "CO\u2082 Emissions from Waste Management", "statVar": "Annual_Emissions_CarbonDioxide_WasteManagement" }, - "Annual_Emissions_GreenhouseGas": { - "name": "Greenhouse Gas Emissions", - "statVar": "Annual_Emissions_GreenhouseGas" - }, - "Annual_Emissions_GreenhouseGas_Agriculture": { - "name": "Greenhouse Gas Emissions from Agriculture", - "statVar": "Annual_Emissions_GreenhouseGas_Agriculture" - }, - "Annual_Emissions_GreenhouseGas_ElectricityGeneration": { - "name": "Greenhouse Gas Emissions from Electricity Generation", - "statVar": "Annual_Emissions_GreenhouseGas_ElectricityGeneration" - }, - "Annual_Emissions_GreenhouseGas_EntericFermentation": { - "name": "Annual Amount of Emissions: Enteric Fermentation, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_EntericFermentation" - }, - "Annual_Emissions_GreenhouseGas_FuelCombustionForCooking": { - "name": "Annual Amount of Emissions: Fuel Combustion for Cooking, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_FuelCombustionForCooking" - }, - "Annual_Emissions_GreenhouseGas_OilAndGasProduction": { - "name": "Annual Amount of Emissions: Oil And Gas Production, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_OilAndGasProduction" - }, - "Annual_Emissions_GreenhouseGas_RiceCultivation": { - "name": "Annual Amount of Emissions: Rice Cultivation, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_RiceCultivation" - }, "Annual_Emissions_Methane_Agriculture": { "name": "Annual Amount of Emissions: Agriculture, Methane", "statVar": "Annual_Emissions_Methane_Agriculture" @@ -717,18 +197,10 @@ "name": "Annual Amount of Emissions: Waste Management, Methane", "statVar": "Annual_Emissions_Methane_WasteManagement" }, - "Annual_Emissions_NitrousOxide_Agriculture": { - "name": "Annual Amount of Emissions: Agriculture, Nitrous Oxide", - "statVar": "Annual_Emissions_NitrousOxide_Agriculture" - }, "Annual_Emissions_NitrousOxide_Agriculture_multiple_place_bar_block": { "name": "Annual Amount of Emissions: Agriculture, Nitrous Oxide", "statVar": "Annual_Emissions_NitrousOxide_Agriculture" }, - "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating": { - "name": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide", - "statVar": "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating" - }, "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating_multiple_place_bar_block": { "name": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide", "statVar": "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating" @@ -757,9 +229,6 @@ } ], "metadata": { - "containedPlaceTypes": { - "Place": "Country" - }, "placeDcid": [ "Earth" ] @@ -774,7 +243,23 @@ "name": "World", "place_type": "Place" }, - "placeFallback": {}, + "placeFallback": { + "newPlace": { + "country": null, + "dcid": "Earth", + "name": "World", + "place_type": "Place" + }, + "newStr": "World", + "origPlace": { + "country": null, + "dcid": "Earth", + "name": "World", + "place_type": "Place" + }, + "origStr": "countries in World", + "origType": "Country" + }, "placeSource": "DEFAULT", "places": [ { @@ -784,366 +269,13 @@ } ], "relatedThings": { - "childPlaces": { - "Country": [ - { - "dcid": "country/ABW", - "name": "Aruba", - "types": [ - "Country" - ] - }, - { - "dcid": "country/AFG", - "name": "Afghanistan", - "types": [ - "Country" - ] - }, - { - "dcid": "country/AGO", - "name": "Angola", - "types": [ - "Country" - ] - }, - { - "dcid": "country/AIA", - "name": "Anguilla", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ALA", - "name": "\u00c5land Islands", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ALB", - "name": "Albania", - "types": [ - "Country" - ] - }, - { - "dcid": "country/AND", - "name": "Andorra", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ANT", - "name": "Netherlands Antilles", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ARE", - "name": "United Arab Emirates", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ARG", - "name": "Argentina", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ARM", - "name": "Armenia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ASM", - "name": "American Samoa", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ATA", - "name": "Antarctica", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ATB", - "name": "British Antarctic Territory", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ATF", - "name": "French Southern Territories", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ATG", - "name": "Antigua and Barbuda", - "types": [ - "Country" - ] - }, - { - "dcid": "country/ATN", - "name": "Dronning Maud Land", - "types": [ - "Country" - ] - }, - { - "dcid": "country/AUS", - "name": "Australia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/AUT", - "name": "Austria", - "types": [ - "Country" - ] - }, - { - "dcid": "country/AZE", - "name": "Azerbaijan", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BDI", - "name": "Burundi", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BEL", - "name": "Belgium", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BEN", - "name": "Benin", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BES", - "name": "Bonaire, Sint Eustatius and Saba", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BFA", - "name": "Burkina Faso", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BGD", - "name": "Bangladesh", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BGR", - "name": "Bulgaria", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BHR", - "name": "Bahrain", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BHS", - "name": "Bahamas", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BIH", - "name": "Bosnia and Herzegovina", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BLM", - "name": "Saint Barth\u00e9lemy", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BLR", - "name": "Belarus", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BLZ", - "name": "Belize", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BMU", - "name": "Bermuda", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BOL", - "name": "Bolivia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BRA", - "name": "Brazil", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BRB", - "name": "Barbados", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BRN", - "name": "Brunei", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BTN", - "name": "Bhutan", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BVT", - "name": "Bouvet Island", - "types": [ - "Country" - ] - }, - { - "dcid": "country/BWA", - "name": "Botswana", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CAF", - "name": "Central African Republic", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CAN", - "name": "Canada", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CCK", - "name": "Cocos (Keeling) Islands", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CHE", - "name": "Switzerland", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CHL", - "name": "Chile", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CHN", - "name": "China", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CIV", - "name": "C\u00f4te d'Ivoire", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CMR", - "name": "Cameroon", - "types": [ - "Country" - ] - }, - { - "dcid": "country/COD", - "name": "Congo [DRC]", - "types": [ - "Country" - ] - } - ] - }, + "childPlaces": {}, "childTopics": [], "exploreMore": {}, "mainTopics": [ { - "dcid": "dc/topic/GreenhouseGasEmissions", - "name": "Greenhouse Gasses", + "dcid": "dc/topic/CO2Emissions", + "name": "Carbondioxide ( CO2)", "types": [ "Topic" ] @@ -1161,13 +293,6 @@ ], "peerPlaces": [], "peerTopics": [ - { - "dcid": "dc/topic/CO2Emissions", - "name": "Carbondioxide ( CO2)", - "types": [ - "Topic" - ] - }, { "dcid": "dc/topic/Emissions_Methane_EmissionsbySource", "name": "Methane", @@ -1186,6 +311,8 @@ }, "svSource": "CURRENT_QUERY", "test": "unittest", - "userMessage": "", - "userMessages": [] + "userMessage": "Sorry, there were no relevant statistics for countries in World. See results for World.", + "userMessages": [ + "Sorry, there were no relevant statistics for countries in World. See results for World." + ] } \ No newline at end of file diff --git a/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json b/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json index 2910153aff..3e3fab2fee 100644 --- a/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json +++ b/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json @@ -11,28 +11,28 @@ "sv_matching": { "CosineScore": [ 0.35510891675949097, - 0.34608712792396545, - 0.34525778889656067, + 0.34608709812164307, + 0.34525781869888306, 0.34484589099884033, - 0.3411365747451782, - 0.3384982645511627, - 0.3349902927875519, - 0.33166080713272095, + 0.34113654494285583, + 0.3384983241558075, + 0.33499041199684143, + 0.3316609561443329, 0.32600581645965576, - 0.32424452900886536, - 0.32060614228248596, - 0.3142656087875366, - 0.31276530027389526, + 0.3242444396018982, + 0.3206062316894531, + 0.314265638589859, + 0.3127653896808624, 0.3126294016838074, - 0.31250450015068054, + 0.31250444054603577, 0.31177398562431335, - 0.31033891439437866, - 0.3100748062133789, - 0.3098834156990051, - 0.30805402994155884, + 0.3103390336036682, + 0.3100748658180237, + 0.3098834753036499, + 0.3080539405345917, 0.3074587285518646, - 0.30719631910324097, - 0.3039420545101166 + 0.3071962594985962, + 0.3039422035217285 ], "MultiSV": {}, "Query": "what is the phylum of", @@ -65,33 +65,33 @@ "props_matching": { "CosineScore": [ 1.0000001192092896, - 0.47528403997421265, - 0.3615415692329407, - 0.3420097827911377, - 0.32933083176612854, - 0.3184516429901123, - 0.3146698474884033, - 0.3083950877189636, + 0.4752838611602783, + 0.361541748046875, + 0.34200987219810486, + 0.3293308615684509, + 0.31845155358314514, + 0.3146699070930481, + 0.3083951473236084, 0.30794060230255127, - 0.3046301305294037, + 0.3046301603317261, 0.2827085256576538, - 0.2818753123283386, + 0.2818754315376282, 0.28082767128944397, - 0.28045278787612915, + 0.28045275807380676, 0.2742983102798462, - 0.2715049386024475, - 0.27071818709373474, - 0.2695465385913849, + 0.27150508761405945, + 0.2707182765007019, + 0.26954665780067444, 0.25990062952041626, 0.25990062952041626, - 0.24827902019023895, - 0.24662014842033386, - 0.24632105231285095, - 0.24616341292858124, + 0.2482791244983673, + 0.24662019312381744, + 0.24632097780704498, + 0.2461635172367096, 0.24212220311164856, - 0.23135532438755035, - 0.2296244204044342, - 0.2277354896068573 + 0.2313552349805832, + 0.22962437570095062, + 0.22773560881614685 ], "PROP": [ "phylum", diff --git a/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json b/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json index 99391169c5..15979781c5 100644 --- a/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json +++ b/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json @@ -12,30 +12,30 @@ "query_with_places_removed": "what types of genes are and", "sv_matching": { "CosineScore": [ - 0.5237791538238525, - 0.4451894164085388, - 0.41981467604637146, - 0.41922128200531006, + 0.5237787961959839, + 0.44518938660621643, + 0.4198148250579834, + 0.4192213714122772, 0.4136667847633362, - 0.4096526503562927, - 0.40661105513572693, - 0.4013715982437134, - 0.4010191261768341, - 0.400637686252594, - 0.39874640107154846, - 0.39836061000823975, - 0.39052367210388184, - 0.3890332579612732, - 0.38846099376678467, - 0.3883823752403259, + 0.4096526801586151, + 0.4066111445426941, + 0.4013715386390686, + 0.40101927518844604, + 0.4006376564502716, + 0.39874643087387085, + 0.39836084842681885, + 0.39052361249923706, + 0.3890334367752075, + 0.38846105337142944, + 0.38838255405426025, 0.3873301148414612, - 0.38642191886901855, - 0.3858962655067444, - 0.3856789469718933, - 0.38543426990509033, - 0.38533884286880493, + 0.3864220976829529, + 0.3858964443206787, + 0.38567888736724854, + 0.3854343295097351, + 0.3853389322757721, 0.3818426728248596, - 0.37970495223999023 + 0.3797049820423126 ], "MultiSV": {}, "Query": "what types of genes are and", @@ -68,29 +68,29 @@ }, "props_matching": { "CosineScore": [ - 0.908610999584198, - 0.7445293664932251, + 0.9086109399795532, + 0.7445291876792908, 0.7330226898193359, - 0.7175887823104858, - 0.6834691166877747, - 0.6590197086334229, - 0.6340402960777283, - 0.5988124012947083, - 0.595878541469574, - 0.5850145220756531, + 0.7175889611244202, + 0.6834694743156433, + 0.6590196490287781, + 0.6340400576591492, + 0.5988123416900635, + 0.5958787202835083, + 0.5850147604942322, 0.5810791850090027, - 0.5432419776916504, + 0.5432420372962952, 0.5399730205535889, - 0.5320467948913574, + 0.5320468544960022, 0.5309585928916931, - 0.5142703056335449, + 0.5142702460289001, 0.5125278234481812, - 0.46105992794036865, - 0.44410809874534607, - 0.3982294797897339, - 0.3944428563117981, - 0.392289936542511, - 0.38480231165885925 + 0.4610599875450134, + 0.4441080391407013, + 0.3982294499874115, + 0.3944430947303772, + 0.3922898471355438, + 0.38480234146118164 ], "PROP": [ "typeOfGene", diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index 1665b0e5d4..7f634f19d8 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -8,43 +8,43 @@ "query_with_places_removed": "compare male population with female population", "sv_matching": { "CosineScore": [ - 0.9187595844268799, - 0.8590543866157532, - 0.8354092836380005, - 0.7823134660720825, + 0.9187593460083008, + 0.8590542674064636, + 0.8354093432426453, + 0.782313346862793, 0.7773187756538391, 0.7762894630432129, - 0.7663271427154541, - 0.766107439994812, - 0.7614184617996216, - 0.7606041431427002, - 0.7595797181129456, - 0.7573733329772949, - 0.7573024034500122, + 0.7663272619247437, + 0.7661074995994568, + 0.7614185810089111, + 0.7606043219566345, + 0.7595797777175903, + 0.7573733925819397, + 0.757302463054657, 0.757297158241272, - 0.7553009390830994, + 0.7553008794784546, 0.7533451318740845, - 0.7532937526702881, - 0.7509560585021973, - 0.7482578754425049, - 0.7451456785202026, - 0.7443947792053223, - 0.7431552410125732, - 0.7426693439483643, - 0.7396597862243652, - 0.7378743290901184, - 0.7371534109115601, - 0.7366002798080444, + 0.7532938122749329, + 0.7509562373161316, + 0.7482577562332153, + 0.7451456189155579, + 0.7443947196006775, + 0.7431553602218628, + 0.7426695227622986, + 0.7396596670150757, + 0.7378741502761841, + 0.7371532917022705, + 0.7366001009941101, 0.7347153425216675, - 0.7339279651641846, + 0.733927845954895, 0.733651876449585, - 0.732607901096344, - 0.7325160503387451, - 0.7302997708320618, - 0.7299268841743469, - 0.7289118766784668, - 0.7289034724235535, - 0.7280722260475159 + 0.7326079607009888, + 0.7325159311294556, + 0.7302998900413513, + 0.7299268245697021, + 0.7289121150970459, + 0.7289034128189087, + 0.7280721664428711 ], "MultiSV": { "Candidates": [ @@ -54,7 +54,7 @@ "Parts": [ { "CosineScore": [ - 0.9257855415344238 + 0.9257857203483582 ], "QueryPart": "male population", "SV": [ @@ -63,8 +63,8 @@ }, { "CosineScore": [ - 0.9296979904174805, - 0.884743332862854 + 0.92969810962677, + 0.8847433924674988 ], "QueryPart": "female population", "SV": [ @@ -89,8 +89,8 @@ }, { "CosineScore": [ - 0.8982378244400024, - 0.8723466992378235 + 0.8982377648353577, + 0.872346818447113 ], "QueryPart": "population", "SV": [ @@ -106,9 +106,9 @@ "Parts": [ { "CosineScore": [ - 0.8034241199493408, - 0.8017654418945312, - 0.775155782699585, + 0.8034242391586304, + 0.8017653822898865, + 0.7751559019088745, 0.7698014974594116, 0.7586972713470459 ], @@ -123,7 +123,7 @@ }, { "CosineScore": [ - 0.9170328378677368 + 0.9170329570770264 ], "QueryPart": "population female population", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json index 8890af5b90..b2b55e0b16 100644 --- a/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json @@ -8,37 +8,37 @@ "query_with_places_removed": "compare obesity vs poverty", "sv_matching": { "CosineScore": [ - 0.8778442740440369, - 0.8041591644287109, - 0.7967699766159058, - 0.762496829032898, - 0.7490020394325256, - 0.7484047412872314, - 0.7442895174026489, - 0.7357541918754578, - 0.7350349426269531, - 0.7310354709625244, - 0.7266261577606201, - 0.7264261841773987, - 0.7264261841773987, - 0.7253916263580322, - 0.7230079174041748, - 0.7218317985534668, - 0.7195377945899963, - 0.7139475345611572, - 0.7126950621604919, - 0.7085550427436829, - 0.7085551023483276, - 0.7080719470977783, - 0.7078822255134583, + 0.8778441548347473, + 0.8041587471961975, + 0.7967696189880371, + 0.7624967098236084, + 0.7490015625953674, + 0.7484045624732971, + 0.744289755821228, + 0.7357543706893921, + 0.7350348830223083, + 0.7310351729393005, + 0.7266256213188171, + 0.7264258861541748, + 0.7264258861541748, + 0.7253913283348083, + 0.7230079770088196, + 0.7218308448791504, + 0.7195378541946411, + 0.713947594165802, + 0.7126948237419128, + 0.7085545063018799, + 0.7085545063018799, + 0.7080722451210022, + 0.7078820466995239, 0.7053750157356262, - 0.7045387029647827, - 0.7024303078651428, - 0.7004534602165222, - 0.6995822191238403, - 0.6994997262954712, - 0.6956704258918762, - 0.6947906613349915 + 0.7045392394065857, + 0.7024306058883667, + 0.7004537582397461, + 0.6995823383331299, + 0.6994994282722473, + 0.6956706047058105, + 0.6947908997535706 ], "MultiSV": { "Candidates": [ @@ -48,8 +48,8 @@ "Parts": [ { "CosineScore": [ - 0.8955404162406921, - 0.8525748252868652 + 0.8955408930778503, + 0.8525749444961548 ], "QueryPart": "obesity", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json index 96f27efac3..e304e2fc8a 100644 --- a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json @@ -8,33 +8,33 @@ "query_with_places_removed": "how are factors like obesity , blood pressure and asthma impacted by climate change", "sv_matching": { "CosineScore": [ - 0.7864793539047241, - 0.691805362701416, - 0.6740915179252625, - 0.6734591722488403, - 0.6704620718955994, - 0.6651462912559509, - 0.6635113954544067, - 0.661127507686615, - 0.6593924760818481, - 0.6569107174873352, + 0.786479115486145, + 0.6918054819107056, + 0.6740914583206177, + 0.6734592318534851, + 0.6704619526863098, + 0.6651464104652405, + 0.663511335849762, + 0.6611274480819702, + 0.6593924164772034, + 0.65691077709198, 0.6520178318023682, - 0.6477762460708618, + 0.6477761268615723, 0.6461696624755859, - 0.6459026336669922, - 0.6435545682907104, - 0.6410900354385376, - 0.6405231952667236, - 0.6402113437652588, - 0.6380343437194824, + 0.6459025740623474, + 0.6435544490814209, + 0.6410900950431824, + 0.6405230760574341, + 0.6402114033699036, + 0.638034462928772, 0.6376669406890869, - 0.6346377730369568, + 0.6346378326416016, 0.6341456174850464, - 0.6338476538658142, - 0.6322696805000305, - 0.6322205662727356, - 0.6317504644393921, - 0.6304948925971985, + 0.6338475346565247, + 0.6322695016860962, + 0.6322205066680908, + 0.6317505240440369, + 0.630495011806488, 0.6302965879440308, 0.6298357844352722 ], @@ -46,13 +46,13 @@ "Parts": [ { "CosineScore": [ - 0.752657413482666, - 0.7335996627807617, + 0.7526575922966003, + 0.7335994243621826, 0.7317348718643188, 0.7282766699790955, - 0.7210124135017395, - 0.7188708782196045, - 0.7138628363609314, + 0.7210123538970947, + 0.7188708186149597, + 0.7138627171516418, 0.7071599960327148 ], "QueryPart": "factors like obesity blood pressure asthma impacted", @@ -84,9 +84,9 @@ "Parts": [ { "CosineScore": [ - 0.7976328730583191, - 0.7576606273651123, - 0.7477304935455322 + 0.7976330518722534, + 0.7576605677604675, + 0.747730553150177 ], "QueryPart": "factors like obesity", "SV": [ @@ -106,7 +106,7 @@ }, { "CosineScore": [ - 0.8027870059013367 + 0.8027869462966919 ], "QueryPart": "asthma impacted climate change", "SV": [ @@ -121,14 +121,14 @@ "Parts": [ { "CosineScore": [ - 0.7495046257972717, - 0.7472653388977051, + 0.7495045065879822, + 0.7472652792930603, 0.7385283708572388, 0.7342654466629028, - 0.7325114011764526, - 0.7185327410697937, - 0.7172330617904663, - 0.703389048576355 + 0.7325113415718079, + 0.7185328006744385, + 0.717232882976532, + 0.7033888697624207 ], "QueryPart": "factors like obesity blood pressure asthma", "SV": [ @@ -144,7 +144,7 @@ }, { "CosineScore": [ - 0.9056921005249023 + 0.9056917428970337 ], "QueryPart": "impacted climate change", "SV": [ @@ -159,7 +159,7 @@ "Parts": [ { "CosineScore": [ - 0.8207905888557434 + 0.8207905292510986 ], "QueryPart": "factors like obesity blood pressure", "SV": [ @@ -168,7 +168,7 @@ }, { "CosineScore": [ - 0.8027870059013367 + 0.8027869462966919 ], "QueryPart": "asthma impacted climate change", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json index 9732c39707..b7f3355532 100644 --- a/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json @@ -8,45 +8,45 @@ "query_with_places_removed": "number of poor hispanic women with phd", "sv_matching": { "CosineScore": [ - 0.7985796332359314, - 0.7883262634277344, - 0.776346743106842, - 0.77406245470047, - 0.7410296201705933, - 0.7334667444229126, - 0.7228284478187561, + 0.7985796928405762, + 0.7883263230323792, + 0.7763466238975525, + 0.7740623950958252, + 0.7410295009613037, + 0.7334668040275574, + 0.7228283286094666, 0.722568929195404, - 0.6995474100112915, - 0.6995023488998413, + 0.699547290802002, + 0.699502170085907, 0.697618305683136, - 0.6974341869354248, - 0.696003794670105, - 0.6953426003456116, - 0.6945168972015381, - 0.6939643621444702, + 0.6974342465400696, + 0.6960037350654602, + 0.6953428387641907, + 0.694516658782959, + 0.6939643025398254, 0.6935360431671143, - 0.6908406019210815, + 0.6908405423164368, 0.6906974911689758, - 0.6896734237670898, - 0.6889521479606628, - 0.6886201500892639, + 0.6896733641624451, + 0.6889522075653076, + 0.6886200308799744, 0.6863292455673218, - 0.6859177947044373, - 0.6827540397644043, - 0.6822139620780945, - 0.6815624237060547, + 0.685917854309082, + 0.6827539205551147, + 0.6822137832641602, + 0.6815624833106995, 0.67987459897995, - 0.676856517791748, - 0.6763089299201965, - 0.6751540303230286, + 0.6768563985824585, + 0.6763089895248413, + 0.6751541495323181, 0.6744991540908813, - 0.6725671291351318, + 0.6725670099258423, 0.6717973947525024, - 0.6691675186157227, + 0.669167697429657, 0.6690007448196411, - 0.6682180762290955, + 0.6682179570198059, 0.6678104400634766, - 0.6650688052177429, + 0.6650689244270325, 0.6648702621459961 ], "MultiSV": { @@ -57,13 +57,13 @@ "Parts": [ { "CosineScore": [ - 0.8311771750450134, - 0.8310011029243469, - 0.8255152702331543, + 0.8311770558357239, + 0.8310011625289917, + 0.8255152106285095, 0.8195514678955078, - 0.8145602345466614, - 0.8090661764144897, - 0.8086389303207397, + 0.8145602941513062, + 0.8090663552284241, + 0.808638870716095, 0.8074402809143066, 0.8002950549125671, 0.7985796332359314, @@ -86,8 +86,8 @@ }, { "CosineScore": [ - 0.8318259119987488, - 0.8029923439025879 + 0.8318257927894592, + 0.8029924035072327 ], "QueryPart": "women phd", "SV": [ @@ -103,7 +103,7 @@ "Parts": [ { "CosineScore": [ - 0.8366719484329224, + 0.8366715908050537, 0.7972691059112549 ], "QueryPart": "number of poor", @@ -115,9 +115,9 @@ { "CosineScore": [ 0.8151505589485168, - 0.7885995507240295, - 0.7775554656982422, - 0.7752053141593933 + 0.7885996103286743, + 0.7775554060935974, + 0.7752053737640381 ], "QueryPart": "hispanic women phd", "SV": [ @@ -135,8 +135,8 @@ "Parts": [ { "CosineScore": [ - 0.8495935201644897, - 0.8335005044937134 + 0.8495936393737793, + 0.8335006833076477 ], "QueryPart": "number of poor hispanic women", "SV": [ @@ -146,11 +146,11 @@ }, { "CosineScore": [ - 0.7646968960762024, + 0.7646969556808472, 0.7476688027381897, - 0.7377066612243652, - 0.7362767457962036, - 0.7305882573127747 + 0.73770672082901, + 0.7362766265869141, + 0.7305881381034851 ], "QueryPart": "phd", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index 1c2ae65093..74fab07acc 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -8,29 +8,29 @@ "query_with_places_removed": "show me the impact of climate change on drought", "sv_matching": { "CosineScore": [ - 0.8393681645393372, - 0.79311203956604, - 0.7699974775314331, + 0.8393682837486267, + 0.7931120991706848, + 0.7699974179267883, 0.7208107709884644, 0.7175306081771851, - 0.6995436549186707, - 0.6863456964492798, - 0.674246609210968, + 0.6995437741279602, + 0.6863457560539246, + 0.6742466688156128, 0.6730499267578125, 0.6703540682792664, - 0.6652892827987671, - 0.6644606590270996, + 0.6652891635894775, + 0.6644605994224548, 0.6353792548179626, - 0.6349931359291077, - 0.6347004771232605, - 0.630818247795105, + 0.6349930763244629, + 0.63470059633255, + 0.6308180689811707, 0.6290862560272217, 0.6256592273712158, - 0.6180376410484314, - 0.6162123084068298, - 0.6141720414161682, - 0.6139707565307617, - 0.6138609647750854, + 0.6180377006530762, + 0.6162122488021851, + 0.6141719818115234, + 0.6139708161354065, + 0.6138609051704407, 0.6123877167701721 ], "MultiSV": { @@ -41,7 +41,7 @@ "Parts": [ { "CosineScore": [ - 0.8787485361099243 + 0.8787487745285034 ], "QueryPart": "show climate change", "SV": [ @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 1.0 + 0.9999997615814209 ], "QueryPart": "drought", "SV": [ @@ -65,10 +65,10 @@ "Parts": [ { "CosineScore": [ - 0.7942368984222412, - 0.7929012775421143, - 0.7586166858673096, - 0.7583957314491272 + 0.7942370772361755, + 0.7929013967514038, + 0.7586168646812439, + 0.7583958506584167 ], "QueryPart": "show climate", "SV": [ @@ -80,7 +80,7 @@ }, { "CosineScore": [ - 0.8665127158164978 + 0.8665125966072083 ], "QueryPart": "change drought", "SV": [ diff --git a/tools/nl/embeddings/input/base/_preindex.csv b/tools/nl/embeddings/input/base/_preindex.csv index 7abf4f16f4..0995d6b705 100644 --- a/tools/nl/embeddings/input/base/_preindex.csv +++ b/tools/nl/embeddings/input/base/_preindex.csv @@ -2087,6 +2087,9 @@ Number of countries using ecosystem-based approaches to managing marine areas,dc Number of countries with mechanisms in place to enhance policy coherence of sustainable development,dc/topic/sdg_17.14.1 "Number of countries with migration policies that facilitate orderly, safe, regular and responsible migration and mobility of people",dc/topic/sdg_10.7.2 "Number of countries with nationally determined contributions, long-term strategies, national adaptation plans and adaptation communications, as reported to the secretariat of the United Nations Framework Convention on Climate Change",dc/topic/sdg_13.2.1 +Number of crash incidents occurred on the national highway,Count_VehicleCrashIncident_NationalHighway +Number of crash incidents on US highway,Count_VehicleCrashIncident_USHighway +Number of crash incidents on state highway,Count_VehicleCrashIncident_StateHighway Number of crimes,Count_CriminalActivities_CombinedCrime Number of cyclones,Count_CycloneEvent Number of deaths,Count_Death @@ -2537,6 +2540,8 @@ Number of married people who reside in noninstitutionalized group quarters,Count Number of married people who reside in nursing facilities,Count_Person_MarriedAndNotSeparated_ResidesInNursingFacilities Number of married white people,Count_Person_15OrMoreYears_MarriedAndNotSeparated_WhiteAlone Number of mobile phone subscriptions per person,Count_Product_MobileCellularSubscription_AsFractionOf_Count_Person +Number of motor vehicle occupants involved in crash,Count_Person_InvolvedInCrash_MotorVehicleOccupant +Number of motorists involved in crash,Count_Person_InvolvedInCrash_Motorists Number of multi race people with disabilities,Count_Person_WithDisability_TwoOrMoreRaces Number of multi races farmers,Count_Person_Producer_TwoOrMoreRaces Number of multi races female With Bachelor or higher Degree,dc/hyfn2tlyz48lb @@ -2572,9 +2577,11 @@ Number of never married white people,Count_Person_15OrMoreYears_NeverMarried_Whi "Number of new HIV infections per 1,000 uninfected population, by sex, age and key populations",dc/topic/sdg_3.3.1 Number of non US citizens,Count_Person_NotAUSCitizen Number of non family households that have not received food stamps in the past 12 months,Count_Household_WithoutFoodStampsInThePast12Months_NonfamilyHousehold +Number of non motor vehicle occupants involved in crash,Count_Person_InvolvedInCrash_NotMotorVehicleOccupant Number of non white females,Count_Person_Female_NonWhite Number of non white people,Count_Person_NonWhite Number of non-family households,Count_Household_NonfamilyHousehold +Number of non-motorists involved in crash,Count_Person_InvolvedInCrash_NonMotorists Number of nonfamily households that received food stamps in the past 12 months,Count_Household_WithFoodStampsInThePast12Months_NonfamilyHousehold Number of nonfamily households without children and received food stamps in the last 12 months,Count_Household_WithFoodStampsInThePast12Months_WithoutChildrenUnder18_NonfamilyHousehold Number of one race people with disabilities,Count_Person_WithDisability_OneRace @@ -2825,6 +2832,7 @@ Number of urban scheduled caste people,Count_Person_ScheduledCaste_Urban Number of urban scheduled caste people below 6 years,Count_Person_ScheduledCaste_YearsUpto6_Urban Number of urban scheduled tribe people,Count_Person_ScheduledTribe_Urban Number of urban scheduled tribe people below 6 years,Count_Person_ScheduledTribe_YearsUpto6_Urban +Number of vehicles crashed in transport,Count_Vehicle_InvolvedInCrash_InTransport "Number of verified cases of killing, kidnapping, enforced disappearance, arbitrary detention and torture of journalists, associated media personnel, trade unionists and human rights advocates in the previous 12 months",dc/topic/sdg_16.10.1 Number of veterans,Count_Person_Veteran "Number of victims of human trafficking per 100K population, by sex, age and form of exploitation",dc/topic/sdg_16.2.2 diff --git a/tools/nl/embeddings/input/base/sheets_svs.csv b/tools/nl/embeddings/input/base/sheets_svs.csv index abfcc0a693..07af5091ac 100644 --- a/tools/nl/embeddings/input/base/sheets_svs.csv +++ b/tools/nl/embeddings/input/base/sheets_svs.csv @@ -2370,6 +2370,10 @@ Count_Person_InLaborForce_ResidesInCollegeOrUniversityStudentHousing,Number of L Count_Person_InLaborForce_ResidesInGroupQuarters,Number of Labor Force Participants reside in Group Quarters Count_Person_InLaborForce_ResidesInNoninstitutionalizedGroupQuarters,Number of Labor Force Participants reside in Noninstitutionalized Group Quarters Count_Person_IsInternetUser_PerCapita,percentage of internet users +Count_Person_InvolvedInCrash_Motorists,Number of motorists involved in crash +Count_Person_InvolvedInCrash_MotorVehicleOccupant,Number of motor vehicle occupants involved in crash +Count_Person_InvolvedInCrash_NonMotorists,Number of non-motorists involved in crash +Count_Person_InvolvedInCrash_NotMotorVehicleOccupant,Number of non motor vehicle occupants involved in crash Count_Person_Literate,Number of Literate people Count_Person_Literate_Female,Number of Literate Females Count_Person_Literate_Male,Number of Literate Males @@ -2760,6 +2764,10 @@ Count_ThunderstormWindEvent,Number of thunderstorm wind events Count_TornadoEvent,Number of tornado events Count_TropicalStormEvent,Number of tropical storm events Count_UnemploymentInsuranceClaim_StateUnemploymentInsurance,Number of state unemployment insurance claims +Count_Vehicle_InvolvedInCrash_InTransport,Number of vehicles crashed in transport +Count_VehicleCrashIncident_NationalHighway,Number of crash incidents occurred on the national highway +Count_VehicleCrashIncident_StateHighway,Number of crash incidents on state highway +Count_VehicleCrashIncident_USHighway,Number of crash incidents on US highway Count_VolcanicAshEvent,Number of volcanic events Count_WasteGenerated_Processed_AsAFractionOf_Count_WasteGenerated,Percentage of waste generated that are processed Count_WaterspoutEvent,Number of waterspouts From 6c84870182ff4da2cf385d8eb7ff05bde91d0e21 Mon Sep 17 00:00:00 2001 From: Hareesh MS Date: Tue, 2 Jul 2024 13:16:44 +0000 Subject: [PATCH 2/8] update test results --- .../query_1/chart_config.json | 921 +++++++++++++++++- .../debug_info.json | 14 +- .../debug_info.json | 2 +- .../chart_config.json | 891 ++++++----------- .../chart_config.json | 172 +--- .../international/query_2/chart_config.json | 490 +--------- 6 files changed, 1232 insertions(+), 1258 deletions(-) diff --git a/server/integration_tests/test_data/demo_climatetrace/query_1/chart_config.json b/server/integration_tests/test_data/demo_climatetrace/query_1/chart_config.json index 9ea77332ed..1d2dd2f94f 100644 --- a/server/integration_tests/test_data/demo_climatetrace/query_1/chart_config.json +++ b/server/integration_tests/test_data/demo_climatetrace/query_1/chart_config.json @@ -4,6 +4,137 @@ "categories": [ { "blocks": [ + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_Agriculture" + ], + "title": "Greenhouse Gas Emissions From Agriculture in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_Agriculture" + ], + "title": "Greenhouse Gas Emissions From Agriculture in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "description": "Greenhouse gas emissions from the growing of crops and livestock for food and raw materials for non-food consumption (measured in tonnes of CO\u2082 equivalents).", + "title": "Greenhouse Gas Emissions From Agriculture in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_ElectricityGeneration" + ], + "title": "Greenhouse Gas Emissions From Electricity Generation in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_ElectricityGeneration" + ], + "title": "Greenhouse Gas Emissions From Electricity Generation in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "description": "Greenhouse gas emissions from electricity generation (measured in tonnes of CO\u2082 equivalents).", + "title": "Greenhouse Gas Emissions From Electricity Generation in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_GreenhouseGas" + ], + "title": "Greenhouse Gas Emissions in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_GreenhouseGas" + ], + "title": "Greenhouse Gas Emissions in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "description": "Annual emissions from all greenhouse gases measured in tonnes of CO\u2082 equivalents.", + "title": "Greenhouse Gas Emissions in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "eia/INTL.4008-8-MMTCD.A" + ], + "title": "CO2 Emissions, Annual in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "eia/INTL.4008-8-MMTCD.A" + ], + "title": "CO2 Emissions, Annual in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "CO2 Emissions, Annual in the World" + }, { "columns": [ { @@ -33,6 +164,37 @@ "denom": "Count_Person", "title": "CO2 Emissions, Annual" }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Amount_Emissions_CarbonDioxide_PerCapita" + ], + "title": "CO2 Emissions Per Capita in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Amount_Emissions_CarbonDioxide_PerCapita" + ], + "title": "CO2 Emissions Per Capita in the World (${date})", + "type": "MAP" + } + ] + } + ], + "title": "CO2 Emissions Per Capita in the World" + }, { "columns": [ { @@ -61,6 +223,72 @@ ], "title": "CO2 Emissions Per Capita" }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_CarbonDioxide_Agriculture" + ], + "title": "CO\u2082 Emissions From Agriculture in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_CarbonDioxide_Agriculture" + ], + "title": "CO\u2082 Emissions From Agriculture in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "description": "CO\u2082 emissions from the growing of crops and livestock for food and raw materials for non-food consumption (measured in tonnes).", + "title": "CO\u2082 Emissions From Agriculture in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" + ], + "title": "CO\u2082 Emissions From Fuel Combustion in Buildings in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" + ], + "title": "CO\u2082 Emissions From Fuel Combustion in Buildings in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "description": "CO\u2082 emissions from onsite fuel combustion in residential, commercial and institutional buildings (measured in tonnes).", + "title": "CO\u2082 Emissions From Fuel Combustion in Buildings in the World" + }, { "columns": [ { @@ -93,6 +321,70 @@ "denom": "Count_Person", "title": "CO2 Emissions by Source" }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_Methane_Agriculture" + ], + "title": "Annual Amount of Emissions: Agriculture, Methane in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_Methane_Agriculture" + ], + "title": "Annual Amount of Emissions: Agriculture, Methane in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Amount of Emissions: Agriculture, Methane in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_Methane_FossilFuelOperations" + ], + "title": "Annual Amount of Emissions: Fossil Fuel Operations, Methane in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_Methane_FossilFuelOperations" + ], + "title": "Annual Amount of Emissions: Fossil Fuel Operations, Methane in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Amount of Emissions: Fossil Fuel Operations, Methane in the World" + }, { "columns": [ { @@ -113,6 +405,70 @@ "denom": "Count_Person", "title": "Methane Emissions by Source" }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_NitrousOxide_Agriculture" + ], + "title": "Annual Amount of Emissions: Agriculture, Nitrous Oxide in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_NitrousOxide_Agriculture" + ], + "title": "Annual Amount of Emissions: Agriculture, Nitrous Oxide in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Amount of Emissions: Agriculture, Nitrous Oxide in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating" + ], + "title": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating" + ], + "title": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide in the World" + }, { "columns": [ { @@ -142,6 +498,134 @@ ], "denom": "Count_Person", "title": "Nitrous Oxide Emissions by Source" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_FuelCombustionForCooking" + ], + "title": "Annual Amount of Emissions: Fuel Combustion for Cooking, Greenhouse Gas in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_FuelCombustionForCooking" + ], + "title": "Annual Amount of Emissions: Fuel Combustion for Cooking, Greenhouse Gas in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Amount of Emissions: Fuel Combustion for Cooking, Greenhouse Gas in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_RiceCultivation" + ], + "title": "Annual Amount of Emissions: Rice Cultivation, Greenhouse Gas in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_RiceCultivation" + ], + "title": "Annual Amount of Emissions: Rice Cultivation, Greenhouse Gas in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Amount of Emissions: Rice Cultivation, Greenhouse Gas in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_OilAndGasProduction" + ], + "title": "Annual Amount of Emissions: Oil and Gas Production, Greenhouse Gas in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_OilAndGasProduction" + ], + "title": "Annual Amount of Emissions: Oil and Gas Production, Greenhouse Gas in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Amount of Emissions: Oil and Gas Production, Greenhouse Gas in the World" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_EntericFermentation" + ], + "title": "Annual Amount of Emissions: Enteric Fermentation, Greenhouse Gas in the World (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_GreenhouseGas_EntericFermentation" + ], + "title": "Annual Amount of Emissions: Enteric Fermentation, Greenhouse Gas in the World (${date})", + "type": "MAP" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Amount of Emissions: Enteric Fermentation, Greenhouse Gas in the World" } ], "statVarSpec": { @@ -149,6 +633,10 @@ "name": "CO2 Emissions Per Capita", "statVar": "Amount_Emissions_CarbonDioxide_PerCapita" }, + "Annual_Emissions_CarbonDioxide_Agriculture": { + "name": "CO\u2082 Emissions from Agriculture", + "statVar": "Annual_Emissions_CarbonDioxide_Agriculture" + }, "Annual_Emissions_CarbonDioxide_Agriculture_multiple_place_bar_block": { "name": "CO\u2082 Emissions from Agriculture", "statVar": "Annual_Emissions_CarbonDioxide_Agriculture" @@ -157,6 +645,10 @@ "name": "CO\u2082 Emissions from Fossil Fuel Operations", "statVar": "Annual_Emissions_CarbonDioxide_FossilFuelOperations" }, + "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings": { + "name": "CO\u2082 Emissions from Fuel Combustion in Buildings", + "statVar": "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" + }, "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings_multiple_place_bar_block": { "name": "CO\u2082 Emissions from Fuel Combustion in Buildings", "statVar": "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" @@ -181,6 +673,34 @@ "name": "CO\u2082 Emissions from Waste Management", "statVar": "Annual_Emissions_CarbonDioxide_WasteManagement" }, + "Annual_Emissions_GreenhouseGas": { + "name": "Greenhouse Gas Emissions", + "statVar": "Annual_Emissions_GreenhouseGas" + }, + "Annual_Emissions_GreenhouseGas_Agriculture": { + "name": "Greenhouse Gas Emissions from Agriculture", + "statVar": "Annual_Emissions_GreenhouseGas_Agriculture" + }, + "Annual_Emissions_GreenhouseGas_ElectricityGeneration": { + "name": "Greenhouse Gas Emissions from Electricity Generation", + "statVar": "Annual_Emissions_GreenhouseGas_ElectricityGeneration" + }, + "Annual_Emissions_GreenhouseGas_EntericFermentation": { + "name": "Annual Amount of Emissions: Enteric Fermentation, Greenhouse Gas", + "statVar": "Annual_Emissions_GreenhouseGas_EntericFermentation" + }, + "Annual_Emissions_GreenhouseGas_FuelCombustionForCooking": { + "name": "Annual Amount of Emissions: Fuel Combustion for Cooking, Greenhouse Gas", + "statVar": "Annual_Emissions_GreenhouseGas_FuelCombustionForCooking" + }, + "Annual_Emissions_GreenhouseGas_OilAndGasProduction": { + "name": "Annual Amount of Emissions: Oil And Gas Production, Greenhouse Gas", + "statVar": "Annual_Emissions_GreenhouseGas_OilAndGasProduction" + }, + "Annual_Emissions_GreenhouseGas_RiceCultivation": { + "name": "Annual Amount of Emissions: Rice Cultivation, Greenhouse Gas", + "statVar": "Annual_Emissions_GreenhouseGas_RiceCultivation" + }, "Annual_Emissions_Methane_Agriculture": { "name": "Annual Amount of Emissions: Agriculture, Methane", "statVar": "Annual_Emissions_Methane_Agriculture" @@ -197,10 +717,18 @@ "name": "Annual Amount of Emissions: Waste Management, Methane", "statVar": "Annual_Emissions_Methane_WasteManagement" }, + "Annual_Emissions_NitrousOxide_Agriculture": { + "name": "Annual Amount of Emissions: Agriculture, Nitrous Oxide", + "statVar": "Annual_Emissions_NitrousOxide_Agriculture" + }, "Annual_Emissions_NitrousOxide_Agriculture_multiple_place_bar_block": { "name": "Annual Amount of Emissions: Agriculture, Nitrous Oxide", "statVar": "Annual_Emissions_NitrousOxide_Agriculture" }, + "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating": { + "name": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide", + "statVar": "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating" + }, "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating_multiple_place_bar_block": { "name": "Annual Amount of Emissions: Fuel Combustion for Residential Commercial Onsite Heating, Nitrous Oxide", "statVar": "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating" @@ -229,6 +757,9 @@ } ], "metadata": { + "containedPlaceTypes": { + "Place": "Country" + }, "placeDcid": [ "Earth" ] @@ -243,23 +774,7 @@ "name": "World", "place_type": "Place" }, - "placeFallback": { - "newPlace": { - "country": null, - "dcid": "Earth", - "name": "World", - "place_type": "Place" - }, - "newStr": "World", - "origPlace": { - "country": null, - "dcid": "Earth", - "name": "World", - "place_type": "Place" - }, - "origStr": "countries in World", - "origType": "Country" - }, + "placeFallback": {}, "placeSource": "DEFAULT", "places": [ { @@ -269,13 +784,366 @@ } ], "relatedThings": { - "childPlaces": {}, + "childPlaces": { + "Country": [ + { + "dcid": "country/ABW", + "name": "Aruba", + "types": [ + "Country" + ] + }, + { + "dcid": "country/AFG", + "name": "Afghanistan", + "types": [ + "Country" + ] + }, + { + "dcid": "country/AGO", + "name": "Angola", + "types": [ + "Country" + ] + }, + { + "dcid": "country/AIA", + "name": "Anguilla", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ALA", + "name": "\u00c5land Islands", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ALB", + "name": "Albania", + "types": [ + "Country" + ] + }, + { + "dcid": "country/AND", + "name": "Andorra", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ANT", + "name": "Netherlands Antilles", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ARE", + "name": "United Arab Emirates", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ARG", + "name": "Argentina", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ARM", + "name": "Armenia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ASM", + "name": "American Samoa", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ATA", + "name": "Antarctica", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ATB", + "name": "British Antarctic Territory", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ATF", + "name": "French Southern Territories", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ATG", + "name": "Antigua and Barbuda", + "types": [ + "Country" + ] + }, + { + "dcid": "country/ATN", + "name": "Dronning Maud Land", + "types": [ + "Country" + ] + }, + { + "dcid": "country/AUS", + "name": "Australia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/AUT", + "name": "Austria", + "types": [ + "Country" + ] + }, + { + "dcid": "country/AZE", + "name": "Azerbaijan", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BDI", + "name": "Burundi", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BEL", + "name": "Belgium", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BEN", + "name": "Benin", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BES", + "name": "Bonaire, Sint Eustatius and Saba", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BFA", + "name": "Burkina Faso", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BGD", + "name": "Bangladesh", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BGR", + "name": "Bulgaria", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BHR", + "name": "Bahrain", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BHS", + "name": "Bahamas", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BIH", + "name": "Bosnia and Herzegovina", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BLM", + "name": "Saint Barth\u00e9lemy", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BLR", + "name": "Belarus", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BLZ", + "name": "Belize", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BMU", + "name": "Bermuda", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BOL", + "name": "Bolivia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BRA", + "name": "Brazil", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BRB", + "name": "Barbados", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BRN", + "name": "Brunei", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BTN", + "name": "Bhutan", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BVT", + "name": "Bouvet Island", + "types": [ + "Country" + ] + }, + { + "dcid": "country/BWA", + "name": "Botswana", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CAF", + "name": "Central African Republic", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CAN", + "name": "Canada", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CCK", + "name": "Cocos (Keeling) Islands", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CHE", + "name": "Switzerland", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CHL", + "name": "Chile", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CHN", + "name": "China", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CIV", + "name": "C\u00f4te d'Ivoire", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CMR", + "name": "Cameroon", + "types": [ + "Country" + ] + }, + { + "dcid": "country/COD", + "name": "Congo [DRC]", + "types": [ + "Country" + ] + } + ] + }, "childTopics": [], "exploreMore": {}, "mainTopics": [ { - "dcid": "dc/topic/CO2Emissions", - "name": "Carbondioxide ( CO2)", + "dcid": "dc/topic/GreenhouseGasEmissions", + "name": "Greenhouse Gasses", "types": [ "Topic" ] @@ -293,6 +1161,13 @@ ], "peerPlaces": [], "peerTopics": [ + { + "dcid": "dc/topic/CO2Emissions", + "name": "Carbondioxide ( CO2)", + "types": [ + "Topic" + ] + }, { "dcid": "dc/topic/Emissions_Methane_EmissionsbySource", "name": "Methane", @@ -311,8 +1186,6 @@ }, "svSource": "CURRENT_QUERY", "test": "unittest", - "userMessage": "Sorry, there were no relevant statistics for countries in World. See results for World.", - "userMessages": [ - "Sorry, there were no relevant statistics for countries in World. See results for World." - ] + "userMessage": "", + "userMessages": [] } \ No newline at end of file diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index 7f634f19d8..1d757a0f4f 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -63,7 +63,7 @@ }, { "CosineScore": [ - 0.92969810962677, + 0.9296980500221252, 0.8847433924674988 ], "QueryPart": "female population", @@ -80,7 +80,7 @@ "Parts": [ { "CosineScore": [ - 0.9117770791053772 + 0.911777138710022 ], "QueryPart": "male population female", "SV": [ @@ -89,8 +89,8 @@ }, { "CosineScore": [ - 0.8982377648353577, - 0.872346818447113 + 0.8982378840446472, + 0.8723468780517578 ], "QueryPart": "population", "SV": [ @@ -107,9 +107,9 @@ { "CosineScore": [ 0.8034242391586304, - 0.8017653822898865, + 0.8017652630805969, 0.7751559019088745, - 0.7698014974594116, + 0.7698014378547668, 0.7586972713470459 ], "QueryPart": "male", @@ -123,7 +123,7 @@ }, { "CosineScore": [ - 0.9170329570770264 + 0.9170328974723816 ], "QueryPart": "population female population", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index 74fab07acc..5ca0726334 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999997615814209 + 0.9999998807907104 ], "QueryPart": "drought", "SV": [ diff --git a/server/integration_tests/test_data/e2e_fallbacks/lifeexpectancyinuscounties/chart_config.json b/server/integration_tests/test_data/e2e_fallbacks/lifeexpectancyinuscounties/chart_config.json index a44dfd5e39..0d4eaf1de5 100644 --- a/server/integration_tests/test_data/e2e_fallbacks/lifeexpectancyinuscounties/chart_config.json +++ b/server/integration_tests/test_data/e2e_fallbacks/lifeexpectancyinuscounties/chart_config.json @@ -12,25 +12,28 @@ "statVarKey": [ "LifeExpectancy_Person" ], - "title": "Life Expectancy in United States", - "type": "LINE" + "title": "Life Expectancy in States of United States (${date})", + "type": "MAP" } ] }, { "tiles": [ { - "description": "Life Expectancy in United States", + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, "statVarKey": [ "LifeExpectancy_Person" ], - "title": "Life Expectancy in United States", - "type": "HIGHLIGHT" + "title": "Life Expectancy in States of United States (${date})", + "type": "RANKING" } ] } ], - "title": "Life Expectancy" + "title": "Life Expectancy in States of United States" }, { "columns": [ @@ -38,16 +41,27 @@ "tiles": [ { "statVarKey": [ - "LifeExpectancy_Person_Female", - "LifeExpectancy_Person_Male" + "LifeExpectancy_Person" ], - "title": "Life Expectancy by Gender in United States", + "title": "Life Expectancy in United States", "type": "LINE" } ] + }, + { + "tiles": [ + { + "description": "Life Expectancy in United States", + "statVarKey": [ + "LifeExpectancy_Person" + ], + "title": "Life Expectancy in United States", + "type": "HIGHLIGHT" + } + ] } ], - "title": "Life Expectancy by Gender" + "title": "Life Expectancy" }, { "columns": [ @@ -55,9 +69,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death" + "LifeExpectancy_Person_Female" ], - "title": "Deaths in Counties of United States (${date})", + "title": "Female Life Expectancy in States of United States (${date})", "type": "MAP" } ] @@ -70,16 +84,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_Death" + "LifeExpectancy_Person_Female" ], - "title": "Deaths in Counties of United States (${date})", + "title": "Female Life Expectancy in States of United States (${date})", "type": "RANKING" } ] } ], - "denom": "Count_Person", - "title": "Deaths in Counties of United States" + "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", + "title": "Female Life Expectancy in States of United States" }, { "columns": [ @@ -87,28 +101,31 @@ "tiles": [ { "statVarKey": [ - "Count_Death" + "LifeExpectancy_Person_Male" ], - "title": "Deaths in United States", - "type": "LINE" + "title": "Male Life Expectancy in States of United States (${date})", + "type": "MAP" } ] }, { "tiles": [ { - "description": "Deaths in United States", + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, "statVarKey": [ - "Count_Death" + "LifeExpectancy_Person_Male" ], - "title": "Deaths in United States", - "type": "HIGHLIGHT" + "title": "Male Life Expectancy in States of United States (${date})", + "type": "RANKING" } ] } ], - "denom": "Count_Person", - "title": "Deaths" + "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", + "title": "Male Life Expectancy in States of United States" }, { "columns": [ @@ -116,9 +133,26 @@ "tiles": [ { "statVarKey": [ - "Count_Death_AsAFractionOfCount_Person" + "LifeExpectancy_Person_Female", + "LifeExpectancy_Person_Male" ], - "title": "Deaths Per Capita in United States", + "title": "Life Expectancy by Gender in United States", + "type": "LINE" + } + ] + } + ], + "title": "Life Expectancy by Gender" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Deaths in United States", "type": "LINE" } ] @@ -126,17 +160,18 @@ { "tiles": [ { - "description": "Deaths Per Capita in United States", + "description": "Deaths in United States", "statVarKey": [ - "Count_Death_AsAFractionOfCount_Person" + "Count_Death" ], - "title": "Deaths Per Capita in United States", + "title": "Deaths in United States", "type": "HIGHLIGHT" } ] } ], - "title": "Deaths Per Capita" + "denom": "Count_Person", + "title": "Deaths" }, { "columns": [ @@ -144,31 +179,27 @@ "tiles": [ { "statVarKey": [ - "Count_Death_DiseasesOfTheNervousSystem" + "Count_Death_AsAFractionOfCount_Person" ], - "title": "Deaths From Diseases of the Nervous System in Counties of United States (${date})", - "type": "MAP" + "title": "Deaths Per Capita in United States", + "type": "LINE" } ] }, { "tiles": [ { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, + "description": "Deaths Per Capita in United States", "statVarKey": [ - "Count_Death_DiseasesOfTheNervousSystem" + "Count_Death_AsAFractionOfCount_Person" ], - "title": "Deaths From Diseases of the Nervous System in Counties of United States (${date})", - "type": "RANKING" + "title": "Deaths Per Capita in United States", + "type": "HIGHLIGHT" } ] } ], - "denom": "Count_Person", - "title": "Deaths From Diseases of the Nervous System in Counties of United States" + "title": "Deaths Per Capita" }, { "columns": [ @@ -176,9 +207,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_DiseasesOfTheRespiratorySystem" + "Count_Death_DiseasesOfTheCirculatorySystem" ], - "title": "Deaths From Diseases of the Respiratory System in Counties of United States (${date})", + "title": "Deaths From Diseases of the Circulatory System in States of United States (${date})", "type": "MAP" } ] @@ -191,16 +222,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_Death_DiseasesOfTheRespiratorySystem" + "Count_Death_DiseasesOfTheCirculatorySystem" ], - "title": "Deaths From Diseases of the Respiratory System in Counties of United States (${date})", + "title": "Deaths From Diseases of the Circulatory System in States of United States (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Deaths From Diseases of the Respiratory System in Counties of United States" + "title": "Deaths From Diseases of the Circulatory System in States of United States" }, { "columns": [ @@ -243,29 +274,26 @@ "statVarKey": [ "Count_Death_Female" ], - "title": "Count of Mortality Event: Female in Counties of United States (${date})", - "type": "MAP" + "title": "Count of Mortality Event: Female in United States", + "type": "LINE" } ] }, { "tiles": [ { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, + "description": "Count of Mortality Event: Female in United States", "statVarKey": [ "Count_Death_Female" ], - "title": "Count of Mortality Event: Female in Counties of United States (${date})", - "type": "RANKING" + "title": "Count of Mortality Event: Female in United States", + "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Count of Mortality Event: Female in Counties of United States" + "title": "Count of Mortality Event: Female" }, { "columns": [ @@ -273,28 +301,31 @@ "tiles": [ { "statVarKey": [ - "Count_Death_Female" + "Count_Death_AbnormalNotClassfied_Female" ], - "title": "Count of Mortality Event: Female in United States", - "type": "LINE" + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States (${date})", + "type": "MAP" } ] }, { "tiles": [ { - "description": "Count of Mortality Event: Female in United States", + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, "statVarKey": [ - "Count_Death_Female" + "Count_Death_AbnormalNotClassfied_Female" ], - "title": "Count of Mortality Event: Female in United States", - "type": "HIGHLIGHT" + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States (${date})", + "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Count of Mortality Event: Female" + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States" }, { "columns": [ @@ -302,9 +333,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_AbnormalNotClassfied_Female" + "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" ], - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in Counties of United States (${date})", + "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States (${date})", "type": "MAP" } ] @@ -317,16 +348,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_Death_AbnormalNotClassfied_Female" + "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" ], - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in Counties of United States (${date})", + "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in Counties of United States" + "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States" }, { "columns": [ @@ -395,9 +426,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_Upto1Years" + "Count_Death_Upto1Years_AbnormalNotClassfied" ], - "title": "Count of Mortality Event: 1 Years or Less in Counties of United States (${date})", + "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States (${date})", "type": "MAP" } ] @@ -410,16 +441,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_Death_Upto1Years" + "Count_Death_Upto1Years_AbnormalNotClassfied" ], - "title": "Count of Mortality Event: 1 Years or Less in Counties of United States (${date})", + "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Count of Mortality Event: 1 Years or Less in Counties of United States" + "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States" }, { "columns": [ @@ -429,7 +460,7 @@ "statVarKey": [ "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" ], - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of United States (${date})", + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States (${date})", "type": "MAP" } ] @@ -444,14 +475,14 @@ "statVarKey": [ "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" ], - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of United States (${date})", + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of United States" + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States" }, { "columns": [ @@ -506,27 +537,31 @@ "tiles": [ { "statVarKey": [ - "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + "dc/67ttwfn9dswch" ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in United States", - "type": "LINE" + "title": "Count of Mortality Event (Measured Based on Jurisdiction): Incarcerated in States of United States (${date})", + "type": "MAP" } ] }, { "tiles": [ { - "description": "Mortality Rate (Age Adjusted, Per Capita) in United States", + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, "statVarKey": [ - "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + "dc/67ttwfn9dswch" ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in United States", - "type": "HIGHLIGHT" + "title": "Count of Mortality Event (Measured Based on Jurisdiction): Incarcerated in States of United States (${date})", + "type": "RANKING" } ] } ], - "title": "Mortality Rate (Age Adjusted, Per Capita)" + "denom": "Count_Person", + "title": "Count of Mortality Event (Measured Based on Jurisdiction): Incarcerated in States of United States" }, { "columns": [ @@ -534,9 +569,9 @@ "tiles": [ { "statVarKey": [ - "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" + "dc/3kk4xws30zxlb" ], - "title": "Average Interval in Months Since Last Live Birth in Counties of United States (${date})", + "title": "Mortality Events (Measured Based on Jurisdiction): NPSOther Cause of Death, Incarcerated in States of United States (${date})", "type": "MAP" } ] @@ -549,15 +584,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" + "dc/3kk4xws30zxlb" ], - "title": "Average Interval in Months Since Last Live Birth in Counties of United States (${date})", + "title": "Mortality Events (Measured Based on Jurisdiction): NPSOther Cause of Death, Incarcerated in States of United States (${date})", "type": "RANKING" } ] } ], - "title": "Average Interval in Months Since Last Live Birth in Counties of United States" + "denom": "Count_Person", + "title": "Mortality Events (Measured Based on Jurisdiction): NPSOther Cause of Death, Incarcerated in States of United States" }, { "columns": [ @@ -565,9 +601,72 @@ "tiles": [ { "statVarKey": [ - "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" + "dc/3s7lndm5j3wp4" ], - "title": "Male Mortality Rate (Age Adjusted) in United States", + "title": "Mortality Events (Measured Based on Jurisdiction): Illness or Natural Cause, Incarcerated in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "dc/3s7lndm5j3wp4" + ], + "title": "Mortality Events (Measured Based on Jurisdiction): Illness or Natural Cause, Incarcerated in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Mortality Events (Measured Based on Jurisdiction): Illness or Natural Cause, Incarcerated in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + ], + "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + ], + "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + ], + "title": "Mortality Rate (Age Adjusted, Per Capita) in United States", "type": "LINE" } ] @@ -575,34 +674,79 @@ { "tiles": [ { - "description": "Male Mortality Rate (Age Adjusted) in United States", + "description": "Mortality Rate (Age Adjusted, Per Capita) in United States", "statVarKey": [ - "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" + "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" ], - "title": "Male Mortality Rate (Age Adjusted) in United States", + "title": "Mortality Rate (Age Adjusted, Per Capita) in United States", "type": "HIGHLIGHT" } ] } ], - "title": "Male Mortality Rate (Age Adjusted)" + "title": "Mortality Rate (Age Adjusted, Per Capita)" }, { "columns": [ { "tiles": [ { - "description": "Diabetes Mellitus, Per 100,000 in United States", "statVarKey": [ - "WHO/SA_0000001421" + "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" ], - "title": "Diabetes Mellitus, Per 100,000 in United States", - "type": "HIGHLIGHT" + "title": "Average Interval in Months Since Last Live Birth in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" + ], + "title": "Average Interval in Months Since Last Live Birth in States of United States (${date})", + "type": "RANKING" } ] } ], - "title": "Diabetes Mellitus, Per 100,000" + "title": "Average Interval in Months Since Last Live Birth in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" + ], + "title": "Male Mortality Rate (Age Adjusted) in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" + ], + "title": "Male Mortality Rate (Age Adjusted) in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Male Mortality Rate (Age Adjusted) in States of United States" }, { "columns": [ @@ -610,9 +754,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_Female_AgeAdjusted_AsAFractionOf_Count_Person_Female" + "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" ], - "title": "Female Mortality Rate (Age Adjusted) in United States", + "title": "Male Mortality Rate (Age Adjusted) in United States", "type": "LINE" } ] @@ -620,34 +764,34 @@ { "tiles": [ { - "description": "Female Mortality Rate (Age Adjusted) in United States", + "description": "Male Mortality Rate (Age Adjusted) in United States", "statVarKey": [ - "Count_Death_Female_AgeAdjusted_AsAFractionOf_Count_Person_Female" + "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" ], - "title": "Female Mortality Rate (Age Adjusted) in United States", + "title": "Male Mortality Rate (Age Adjusted) in United States", "type": "HIGHLIGHT" } ] } ], - "title": "Female Mortality Rate (Age Adjusted)" + "title": "Male Mortality Rate (Age Adjusted)" }, { "columns": [ { "tiles": [ { - "description": "Ischaemic Heart Disease, Per 100,000 in United States", + "description": "Diabetes Mellitus, Per 100,000 in United States", "statVarKey": [ - "WHO/SA_0000001425" + "WHO/SA_0000001421" ], - "title": "Ischaemic Heart Disease, Per 100,000 in United States", + "title": "Diabetes Mellitus, Per 100,000 in United States", "type": "HIGHLIGHT" } ] } ], - "title": "Ischaemic Heart Disease, Per 100,000" + "title": "Diabetes Mellitus, Per 100,000" } ], "statVarSpec": { @@ -675,6 +819,10 @@ "name": "Deaths Per Capita", "statVar": "Count_Death_AsAFractionOfCount_Person" }, + "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female": { + "name": "Female Deaths Due To Certain Conditions Originating in The Perinatal Period", + "statVar": "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" + }, "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Certain Conditions Originating in The Perinatal Period", "statVar": "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" @@ -707,6 +855,10 @@ "name": "Deaths Due To Diseases of The Blood And Blood-forming Organs And Certain Disorders Involving The Immune Mechanism", "statVar": "Count_Death_DiseasesOfBloodAndBloodFormingOrgansAndImmuneDisorders" }, + "Count_Death_DiseasesOfTheCirculatorySystem": { + "name": "Deaths From Diseases of the Circulatory System", + "statVar": "Count_Death_DiseasesOfTheCirculatorySystem" + }, "Count_Death_DiseasesOfTheCirculatorySystem_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Diseases of The Circulatory System", "statVar": "Count_Death_DiseasesOfTheCirculatorySystem_Female" @@ -715,22 +867,10 @@ "name": "Deaths From Diseases of the Circulatory System", "statVar": "Count_Death_DiseasesOfTheCirculatorySystem" }, - "Count_Death_DiseasesOfTheNervousSystem": { - "name": "Deaths From Diseases of the Nervous System", - "statVar": "Count_Death_DiseasesOfTheNervousSystem" - }, - "Count_Death_DiseasesOfTheRespiratorySystem": { - "name": "Deaths From Diseases of the Respiratory System", - "statVar": "Count_Death_DiseasesOfTheRespiratorySystem" - }, "Count_Death_Female": { "name": "Count of Mortality Event: Female", "statVar": "Count_Death_Female" }, - "Count_Death_Female_AgeAdjusted_AsAFractionOf_Count_Person_Female": { - "name": "Female Mortality Rate (Age Adjusted)", - "statVar": "Count_Death_Female_AgeAdjusted_AsAFractionOf_Count_Person_Female" - }, "Count_Death_IntentionalSelfHarm_AsFractionOf_Count_Person_multiple_place_bar_block": { "name": "% of Suicide Events", "statVar": "Count_Death_IntentionalSelfHarm_AsFractionOf_Count_Person" @@ -747,9 +887,9 @@ "name": "Deaths From Neoplasms (Tumors or Abnormal Growths)", "statVar": "Count_Death_Neoplasms" }, - "Count_Death_Upto1Years": { - "name": "Count of Mortality Event: 1 Years or Less", - "statVar": "Count_Death_Upto1Years" + "Count_Death_Upto1Years_AbnormalNotClassfied": { + "name": "Mortality Events (1 Years or Less): Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified)", + "statVar": "Count_Death_Upto1Years_AbnormalNotClassfied" }, "Count_Death_Upto1Years_AbnormalNotClassfied_multiple_place_bar_block": { "name": "Mortality Events (1 Years or Less): Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified)", @@ -811,9 +951,17 @@ "name": "Diabetes Mellitus, Per 100,000", "statVar": "WHO/SA_0000001421" }, - "WHO/SA_0000001425": { - "name": "Ischaemic Heart Disease, Per 100,000", - "statVar": "WHO/SA_0000001425" + "dc/3kk4xws30zxlb": { + "name": "Mortality Events (Measured Based on Jurisdiction): NPSOther Cause of Death, Incarcerated", + "statVar": "dc/3kk4xws30zxlb" + }, + "dc/3s7lndm5j3wp4": { + "name": "Mortality Events (Measured Based on Jurisdiction): Illness or Natural Cause, Incarcerated", + "statVar": "dc/3s7lndm5j3wp4" + }, + "dc/67ttwfn9dswch": { + "name": "Count of Mortality Event (Measured Based on Jurisdiction): Incarcerated", + "statVar": "dc/67ttwfn9dswch" }, "sdg/SH_DYN_IMRT.AGE--Y0__SEX--F": { "name": "Infant mortality rate", @@ -832,7 +980,7 @@ ], "metadata": { "containedPlaceTypes": { - "Country": "County" + "Country": "State" }, "placeDcid": [ "country/USA" @@ -848,7 +996,24 @@ "name": "United States", "place_type": "Country" }, - "placeFallback": {}, + "placeFallback": { + "newPlace": { + "country": "country/USA", + "dcid": "country/USA", + "name": "United States", + "place_type": "Country" + }, + "newStr": "states in United States", + "newType": "State", + "origPlace": { + "country": "country/USA", + "dcid": "country/USA", + "name": "United States", + "place_type": "Country" + }, + "origStr": "counties in United States", + "origType": "County" + }, "placeSource": "CURRENT_QUERY", "places": [ { @@ -858,360 +1023,7 @@ } ], "relatedThings": { - "childPlaces": { - "County": [ - { - "dcid": "geoId/01001", - "name": "Autauga", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01003", - "name": "Baldwin", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01005", - "name": "Barbour", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01007", - "name": "Bibb", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01009", - "name": "Blount", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01011", - "name": "Bullock", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01013", - "name": "Butler", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01015", - "name": "Calhoun", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01017", - "name": "Chambers", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01019", - "name": "Cherokee", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01021", - "name": "Chilton", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01023", - "name": "Choctaw", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01025", - "name": "Clarke", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01027", - "name": "Clay", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01029", - "name": "Cleburne", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01031", - "name": "Coffee", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01033", - "name": "Colbert", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01035", - "name": "Conecuh", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01037", - "name": "Coosa", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01039", - "name": "Covington", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01041", - "name": "Crenshaw", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01043", - "name": "Cullman", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01045", - "name": "Dale", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01047", - "name": "Dallas", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01049", - "name": "DeKalb", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01051", - "name": "Elmore", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01053", - "name": "Escambia", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01055", - "name": "Etowah", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01057", - "name": "Fayette", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01059", - "name": "Franklin", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01061", - "name": "Geneva", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01063", - "name": "Greene", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01065", - "name": "Hale", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01067", - "name": "Henry", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01069", - "name": "Houston", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01071", - "name": "Jackson", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01073", - "name": "Jefferson", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01075", - "name": "Lamar", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01077", - "name": "Lauderdale", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01079", - "name": "Lawrence", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01081", - "name": "Lee", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01083", - "name": "Limestone", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01085", - "name": "Lowndes", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01087", - "name": "Macon", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01089", - "name": "Madison", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01091", - "name": "Marengo", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01093", - "name": "Marion", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01095", - "name": "Marshall", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01097", - "name": "Mobile", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/01099", - "name": "Monroe", - "types": [ - "County" - ] - } - ] - }, + "childPlaces": {}, "childTopics": [], "exploreMore": { "Count_Death": { @@ -1283,106 +1095,7 @@ ] } ], - "peerPlaces": [ - { - "dcid": "country/BRA", - "name": "Brazil", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CAN", - "name": "Canada", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CHN", - "name": "China", - "types": [ - "Country" - ] - }, - { - "dcid": "country/EGY", - "name": "Egypt", - "types": [ - "Country" - ] - }, - { - "dcid": "country/FRA", - "name": "France", - "types": [ - "Country" - ] - }, - { - "dcid": "country/DEU", - "name": "Germany", - "types": [ - "Country" - ] - }, - { - "dcid": "country/IND", - "name": "India", - "types": [ - "Country" - ] - }, - { - "dcid": "country/JPN", - "name": "Japan", - "types": [ - "Country" - ] - }, - { - "dcid": "country/MYS", - "name": "Malaysia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/NZL", - "name": "New Zealand", - "types": [ - "Country" - ] - }, - { - "dcid": "country/NGA", - "name": "Nigeria", - "types": [ - "Country" - ] - }, - { - "dcid": "country/PER", - "name": "Peru", - "types": [ - "Country" - ] - }, - { - "dcid": "country/RUS", - "name": "Russia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/GBR", - "name": "United Kingdom", - "types": [ - "Country" - ] - } - ], + "peerPlaces": [], "peerTopics": [ { "dcid": "dc/topic/CausesOfDeath", @@ -1408,6 +1121,8 @@ ] }, "svSource": "CURRENT_QUERY", - "userMessage": "", - "userMessages": [] + "userMessage": "Sorry, there were no relevant statistics for counties in United States. See results for states in United States.", + "userMessages": [ + "Sorry, there were no relevant statistics for counties in United States. See results for states in United States." + ] } \ No newline at end of file diff --git a/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json b/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json index d15f3e6c0a..81320ab964 100644 --- a/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json +++ b/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json @@ -118,39 +118,6 @@ "startWithDenom": true, "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period)" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" - ], - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of Massachusetts (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" - ], - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of Massachusetts (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "startWithDenom": true, - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of Massachusetts" - }, { "columns": [ { @@ -238,39 +205,6 @@ "denom": "Count_Person", "startWithDenom": true, "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities)" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_Upto1Years_CongenitalMalformationsDeformationsChromosomalAbnormalities" - ], - "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities) in Counties of Massachusetts (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_Upto1Years_CongenitalMalformationsDeformationsChromosomalAbnormalities" - ], - "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities) in Counties of Massachusetts (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "startWithDenom": true, - "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities) in Counties of Massachusetts" } ], "statVarSpec": { @@ -306,9 +240,6 @@ } ], "metadata": { - "containedPlaceTypes": { - "State": "County" - }, "placeDcid": [ "geoId/25" ] @@ -333,108 +264,7 @@ } ], "relatedThings": { - "childPlaces": { - "County": [ - { - "dcid": "geoId/25001", - "name": "Barnstable", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25003", - "name": "Berkshire", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25005", - "name": "Bristol", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25007", - "name": "Dukes", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25009", - "name": "Essex", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25011", - "name": "Franklin", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25013", - "name": "Hampden", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25015", - "name": "Hampshire", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25017", - "name": "Middlesex", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25019", - "name": "Nantucket", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25021", - "name": "Norfolk", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25023", - "name": "Plymouth", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25025", - "name": "Suffolk", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/25027", - "name": "Worcester", - "types": [ - "County" - ] - } - ] - }, + "childPlaces": {}, "childTopics": [], "exploreMore": {}, "mainTopics": [ diff --git a/server/integration_tests/test_data/international/query_2/chart_config.json b/server/integration_tests/test_data/international/query_2/chart_config.json index e62f45e80d..e14a03423b 100644 --- a/server/integration_tests/test_data/international/query_2/chart_config.json +++ b/server/integration_tests/test_data/international/query_2/chart_config.json @@ -4,37 +4,6 @@ "categories": [ { "blocks": [ - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "LifeExpectancy_Person" - ], - "title": "Life Expectancy in Administrative Area 1 Places of China (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "LifeExpectancy_Person" - ], - "title": "Life Expectancy in Administrative Area 1 Places of China (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Life Expectancy in Administrative Area 1 Places of China" - }, { "columns": [ { @@ -63,70 +32,6 @@ ], "title": "Life Expectancy" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "LifeExpectancy_Person_Female" - ], - "title": "Female Life Expectancy in Administrative Area 1 Places of China (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "LifeExpectancy_Person_Female" - ], - "title": "Female Life Expectancy in Administrative Area 1 Places of China (${date})", - "type": "RANKING" - } - ] - } - ], - "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", - "title": "Female Life Expectancy in Administrative Area 1 Places of China" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "LifeExpectancy_Person_Male" - ], - "title": "Male Life Expectancy in Administrative Area 1 Places of China (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "LifeExpectancy_Person_Male" - ], - "title": "Male Life Expectancy in Administrative Area 1 Places of China (${date})", - "type": "RANKING" - } - ] - } - ], - "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", - "title": "Male Life Expectancy in Administrative Area 1 Places of China" - }, { "columns": [ { @@ -162,37 +67,6 @@ "denom": "Count_Person", "title": "Deaths" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_AsAFractionOfCount_Person" - ], - "title": "Deaths Per Capita in Administrative Area 1 Places of China (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_AsAFractionOfCount_Person" - ], - "title": "Deaths Per Capita in Administrative Area 1 Places of China (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Deaths Per Capita in Administrative Area 1 Places of China" - }, { "columns": [ { @@ -668,9 +542,6 @@ } ], "metadata": { - "containedPlaceTypes": { - "Country": "AdministrativeArea1" - }, "placeDcid": [ "country/CHN" ] @@ -685,7 +556,23 @@ "name": "China", "place_type": "Country" }, - "placeFallback": {}, + "placeFallback": { + "newPlace": { + "country": "country/CHN", + "dcid": "country/CHN", + "name": "China", + "place_type": "Country" + }, + "newStr": "China", + "origPlace": { + "country": "country/CHN", + "dcid": "country/CHN", + "name": "China", + "place_type": "Country" + }, + "origStr": "administrative area 1 places in China", + "origType": "AdministrativeArea1" + }, "placeSource": "CURRENT_QUERY", "places": [ { @@ -695,241 +582,7 @@ } ], "relatedThings": { - "childPlaces": { - "AdministrativeArea1": [ - { - "dcid": "country/MAC", - "name": "Macau", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q11725", - "name": "Chongqing", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q11736", - "name": "Tianjin", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q15175", - "name": "Guangdong", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q15176", - "name": "Guangxi Zhuang Autonomous Region", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q16963", - "name": "Jiangsu", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q16967", - "name": "Zhejiang", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q17269", - "name": "Tibet Autonomous Region", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q19206", - "name": "Heilongjiang", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q19770", - "name": "Sichuan", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q21208", - "name": "Hebei", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q34800", - "name": "Xinjiang", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q40956", - "name": "Anhui", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q41079", - "name": "Inner Mongolia", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q41705", - "name": "Fujian", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q42200", - "name": "Hainan", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q42392", - "name": "Gansu", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q43194", - "name": "Yunnan", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q43407", - "name": "Shandong", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q43684", - "name": "Henan", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q43934", - "name": "Liaoning", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q45208", - "name": "Jilin", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q45761", - "name": "Hunan", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q45833", - "name": "Qinghai", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q46862", - "name": "Hubei", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q46913", - "name": "Shanxi", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q47097", - "name": "Guizhou", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q47974", - "name": "Shaanxi", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q57052", - "name": "Jiangxi", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q57251", - "name": "Taiwan Province, People's Republic of China", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q57448", - "name": "Ningxia Hui Autonomous Region", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q8686", - "name": "Shanghai", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q956", - "name": "Beijing", - "types": [ - "AdministrativeArea1" - ] - } - ] - }, + "childPlaces": {}, "childTopics": [], "exploreMore": { "LifeExpectancy_Person": { @@ -958,106 +611,7 @@ ] } ], - "peerPlaces": [ - { - "dcid": "country/BRA", - "name": "Brazil", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CAN", - "name": "Canada", - "types": [ - "Country" - ] - }, - { - "dcid": "country/EGY", - "name": "Egypt", - "types": [ - "Country" - ] - }, - { - "dcid": "country/FRA", - "name": "France", - "types": [ - "Country" - ] - }, - { - "dcid": "country/DEU", - "name": "Germany", - "types": [ - "Country" - ] - }, - { - "dcid": "country/IND", - "name": "India", - "types": [ - "Country" - ] - }, - { - "dcid": "country/JPN", - "name": "Japan", - "types": [ - "Country" - ] - }, - { - "dcid": "country/MYS", - "name": "Malaysia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/NZL", - "name": "New Zealand", - "types": [ - "Country" - ] - }, - { - "dcid": "country/NGA", - "name": "Nigeria", - "types": [ - "Country" - ] - }, - { - "dcid": "country/PER", - "name": "Peru", - "types": [ - "Country" - ] - }, - { - "dcid": "country/RUS", - "name": "Russia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/GBR", - "name": "United Kingdom", - "types": [ - "Country" - ] - }, - { - "dcid": "country/USA", - "name": "United States", - "types": [ - "Country" - ] - } - ], + "peerPlaces": [], "peerTopics": [ { "dcid": "dc/topic/CausesOfDeath", @@ -1076,6 +630,8 @@ ] }, "svSource": "CURRENT_QUERY", - "userMessage": "", - "userMessages": [] + "userMessage": "Sorry, there were no relevant statistics for administrative area 1 places in China. See results for China.", + "userMessages": [ + "Sorry, there were no relevant statistics for administrative area 1 places in China. See results for China." + ] } \ No newline at end of file From 181f608269cb09649a85178ff826be036b09f50a Mon Sep 17 00:00:00 2001 From: Hareesh MS Date: Tue, 2 Jul 2024 13:58:06 +0000 Subject: [PATCH 3/8] Update goldens --- .../debug_info.json | 12 +- .../debug_info.json | 8 +- .../chart_config.json | 1374 ++--------------- .../chart_config.json | 172 ++- .../international/query_2/chart_config.json | 490 +++++- 5 files changed, 751 insertions(+), 1305 deletions(-) diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index 1d757a0f4f..a27bb8f3cb 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -63,7 +63,7 @@ }, { "CosineScore": [ - 0.9296980500221252, + 0.92969810962677, 0.8847433924674988 ], "QueryPart": "female population", @@ -89,8 +89,8 @@ }, { "CosineScore": [ - 0.8982378840446472, - 0.8723468780517578 + 0.8982377648353577, + 0.872346818447113 ], "QueryPart": "population", "SV": [ @@ -107,8 +107,8 @@ { "CosineScore": [ 0.8034242391586304, - 0.8017652630805969, - 0.7751559019088745, + 0.8017653226852417, + 0.775155782699585, 0.7698014378547668, 0.7586972713470459 ], @@ -123,7 +123,7 @@ }, { "CosineScore": [ - 0.9170328974723816 + 0.9170329570770264 ], "QueryPart": "population female population", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index 5ca0726334..fe032de717 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999998807907104 + 0.9999998211860657 ], "QueryPart": "drought", "SV": [ @@ -65,9 +65,9 @@ "Parts": [ { "CosineScore": [ - 0.7942370772361755, - 0.7929013967514038, - 0.7586168646812439, + 0.7942370176315308, + 0.7929014563560486, + 0.7586166858673096, 0.7583958506584167 ], "QueryPart": "show climate", diff --git a/server/integration_tests/test_data/e2e_date_range/populationincaliforniaafter2013/chart_config.json b/server/integration_tests/test_data/e2e_date_range/populationincaliforniaafter2013/chart_config.json index b1b2831337..124822d06b 100644 --- a/server/integration_tests/test_data/e2e_date_range/populationincaliforniaafter2013/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/populationincaliforniaafter2013/chart_config.json @@ -35,37 +35,6 @@ ], "title": "Population" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person" - ], - "title": "Population in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person" - ], - "title": "Population in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Population in Counties of California" - }, { "columns": [ { @@ -128,37 +97,6 @@ ], "title": "Median Age of Population" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Median_Age_Person" - ], - "title": "Median Age of Population in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Median_Age_Person" - ], - "title": "Median Age of Population in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Median Age of Population in Counties of California" - }, { "columns": [ { @@ -179,68 +117,6 @@ ], "title": "Median Age by Gender" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Median_Age_Person_Female" - ], - "title": "Women's Median Age in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Median_Age_Person_Female" - ], - "title": "Women's Median Age in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Women's Median Age in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Median_Age_Person_Male" - ], - "title": "Men's Median Age in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Median_Age_Person_Male" - ], - "title": "Men's Median Age in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Men's Median Age in Counties of California" - }, { "columns": [ { @@ -272,622 +148,81 @@ } ], "denom": "Count_Person", - "title": "Age Distribution" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_1To4Years" - ], - "title": "Population: 1-4 Years in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_1To4Years" - ], - "title": "Population: 1-4 Years in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population: 1-4 Years in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_5To17Years" - ], - "title": "Population Aged 5 to 17 in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_5To17Years" - ], - "title": "Population Aged 5 to 17 in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population Aged 5 to 17 in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "lineTileSpec": { - "startDate": "2014" - }, - "statVarKey": [ - "Count_Person_85OrMoreYears_Female_1145703171", - "Count_Person_85OrMoreYears_Male_1145703171" - ], - "title": "Population 85 or Over by Gender in California", - "type": "LINE" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population 85 or Over by Gender" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_85OrMoreYears_Female" - ], - "title": "Women Over 85 in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_85OrMoreYears_Female" - ], - "title": "Women Over 85 in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Women Over 85 in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_85OrMoreYears_Male" - ], - "title": "Men Over 85 in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_85OrMoreYears_Male" - ], - "title": "Men Over 85 in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Men Over 85 in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "lineTileSpec": { - "startDate": "2014" - }, - "statVarKey": [ - "Count_Person_Female_1145703171", - "Count_Person_Male_1145703171" - ], - "title": "Population by Gender in California", - "type": "LINE" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population by Gender" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_Female" - ], - "title": "Women in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_Female" - ], - "title": "Women in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Women in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_Male" - ], - "title": "Men in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_Male" - ], - "title": "Men in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Men in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "geoId/06" - ], - "statVarKey": [ - "Count_Person_WhiteAlone_multiple_place_bar_block", - "Count_Person_BlackOrAfricanAmericanAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_multiple_place_bar_block", - "Count_Person_AsianAlone_multiple_place_bar_block", - "Count_Person_AmericanIndianAndAlaskaNativeAlone_multiple_place_bar_block", - "Count_Person_AsianOrPacificIslander_multiple_place_bar_block", - "Count_Person_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", - "Count_Person_SomeOtherRaceAlone_multiple_place_bar_block" - ], - "title": "Monoracial Breakdown in California (${date})", - "type": "BAR" - } - ] - } - ], - "denom": "Count_Person", - "title": "Monoracial Breakdown" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_WhiteAlone" - ], - "title": "White Monoracial Population in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_WhiteAlone" - ], - "title": "White Monoracial Population in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "White Monoracial Population in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_BlackOrAfricanAmericanAlone" - ], - "title": "Black Monoracial Population in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_BlackOrAfricanAmericanAlone" - ], - "title": "Black Monoracial Population in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Black Monoracial Population in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "lineTileSpec": { - "startDate": "2014" - }, - "statVarKey": [ - "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", - "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", - "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", - "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", - "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208" - ], - "title": "Monoracial/multiracial Breakdown in California", - "type": "LINE" - } - ] - } - ], - "denom": "Count_Person", - "title": "Monoracial/multiracial Breakdown" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" - ], - "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" - ], - "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" - ], - "title": "Asian Population, Monoracial/Multiracial in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" - ], - "title": "Asian Population, Monoracial/Multiracial in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Asian Population, Monoracial/Multiracial in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "geoId/06" - ], - "statVarKey": [ - "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_AsianAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_WhiteAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" - ], - "title": "Racial Breakdown With Hispanic Consideration in California (${date})", - "type": "BAR" - } - ] - } - ], - "denom": "Count_Person", - "title": "Racial Breakdown With Hispanic Consideration" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" - ], - "title": "Hispanic American Indian Population in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" - ], - "title": "Hispanic American Indian Population in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Hispanic American Indian Population in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_HispanicOrLatino_AsianAlone" - ], - "title": "Hispanic Asian Population in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_HispanicOrLatino_AsianAlone" - ], - "title": "Hispanic Asian Population in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Hispanic Asian Population in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "geoId/06" - ], - "statVarKey": [ - "Count_Person_WhiteAloneNotHispanicOrLatino_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_AsianAlone_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" - ], - "title": "Racial Breakdown With Non Hispanic Consideration in California (${date})", - "type": "BAR" - } - ] - } - ], - "denom": "Count_Person", - "title": "Racial Breakdown With Non Hispanic Consideration" + "title": "Age Distribution" }, { "columns": [ { "tiles": [ { - "statVarKey": [ - "Count_Person_WhiteAloneNotHispanicOrLatino" - ], - "title": "White Hispanic Monoracial Population in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true + "lineTileSpec": { + "startDate": "2014" }, "statVarKey": [ - "Count_Person_WhiteAloneNotHispanicOrLatino" + "Count_Person_85OrMoreYears_Female_1145703171", + "Count_Person_85OrMoreYears_Male_1145703171" ], - "title": "White Hispanic Monoracial Population in Counties of California (${date})", - "type": "RANKING" + "title": "Population 85 or Over by Gender in California", + "type": "LINE" } ] } ], "denom": "Count_Person", - "title": "White Hispanic Monoracial Population in Counties of California" + "title": "Population 85 or Over by Gender" }, { "columns": [ { "tiles": [ { + "lineTileSpec": { + "startDate": "2014" + }, "statVarKey": [ - "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + "Count_Person_Female_1145703171", + "Count_Person_Male_1145703171" ], - "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in Counties of California (${date})", - "type": "MAP" + "title": "Population by Gender in California", + "type": "LINE" } ] - }, + } + ], + "denom": "Count_Person", + "title": "Population by Gender" + }, + { + "columns": [ { "tiles": [ { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" }, + "comparisonPlaces": [ + "geoId/06" + ], "statVarKey": [ - "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + "Count_Person_WhiteAlone_multiple_place_bar_block", + "Count_Person_BlackOrAfricanAmericanAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_multiple_place_bar_block", + "Count_Person_AsianAlone_multiple_place_bar_block", + "Count_Person_AmericanIndianAndAlaskaNativeAlone_multiple_place_bar_block", + "Count_Person_AsianOrPacificIslander_multiple_place_bar_block", + "Count_Person_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", + "Count_Person_SomeOtherRaceAlone_multiple_place_bar_block" ], - "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in Counties of California (${date})", - "type": "RANKING" + "title": "Monoracial Breakdown in California (${date})", + "type": "BAR" } ] } ], "denom": "Count_Person", - "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in Counties of California" + "title": "Monoracial Breakdown" }, { "columns": [ @@ -898,81 +233,110 @@ "startDate": "2014" }, "statVarKey": [ - "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome_1145703171", - "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome_1145703171" + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", + "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", + "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", + "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208" ], - "title": "Spoken English at Home in California", + "title": "Monoracial/multiracial Breakdown in California", "type": "LINE" } ] } ], "denom": "Count_Person", - "title": "Spoken English at Home" + "title": "Monoracial/multiracial Breakdown" }, { "columns": [ { "tiles": [ { - "statVarKey": [ - "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome" - ], - "title": "Population: English Spoken at Home in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" }, + "comparisonPlaces": [ + "geoId/06" + ], "statVarKey": [ - "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome" + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AsianAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_WhiteAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" ], - "title": "Population: English Spoken at Home in Counties of California (${date})", - "type": "RANKING" + "title": "Racial Breakdown With Hispanic Consideration in California (${date})", + "type": "BAR" } ] } ], "denom": "Count_Person", - "title": "Population: English Spoken at Home in Counties of California" + "title": "Racial Breakdown With Hispanic Consideration" }, { "columns": [ { "tiles": [ { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "geoId/06" + ], "statVarKey": [ - "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome" + "Count_Person_WhiteAloneNotHispanicOrLatino_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AsianAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" ], - "title": "Population: Some Language Other Than English Spoken at Home in Counties of California (${date})", - "type": "MAP" + "title": "Racial Breakdown With Non Hispanic Consideration in California (${date})", + "type": "BAR" } ] - }, + } + ], + "denom": "Count_Person", + "title": "Racial Breakdown With Non Hispanic Consideration" + }, + { + "columns": [ { "tiles": [ { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true + "lineTileSpec": { + "startDate": "2014" }, "statVarKey": [ - "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome" + "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome_1145703171", + "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome_1145703171" ], - "title": "Population: Some Language Other Than English Spoken at Home in Counties of California (${date})", - "type": "RANKING" + "title": "Spoken English at Home in California", + "type": "LINE" } ] } ], "denom": "Count_Person", - "title": "Population: Some Language Other Than English Spoken at Home in Counties of California" + "title": "Spoken English at Home" }, { "columns": [ @@ -1036,70 +400,6 @@ "denom": "Count_Person", "title": "Non-English Languages Spoken at Home" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome" - ], - "title": "Population: African Language Spoken at Home in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome" - ], - "title": "Population: African Language Spoken at Home in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population: African Language Spoken at Home in Counties of California" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_5OrMoreYears_ArabicSpokenAtHome" - ], - "title": "Population: Arabic Spoken at Home in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_5OrMoreYears_ArabicSpokenAtHome" - ], - "title": "Population: Arabic Spoken at Home in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population: Arabic Spoken at Home in Counties of California" - }, { "columns": [ { @@ -1131,38 +431,6 @@ ], "denom": "Count_Person", "title": "Divorcees" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_Divorced" - ], - "title": "Divorcees in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_Divorced" - ], - "title": "Divorcees in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Divorcees in Counties of California" } ], "statVarSpec": { @@ -1174,10 +442,6 @@ "name": "Population Aged 18 to 24 Years", "statVar": "Count_Person_18To24Years" }, - "Count_Person_1To4Years": { - "name": "Population: 1 - 4 Years", - "statVar": "Count_Person_1To4Years" - }, "Count_Person_1To4Years_multiple_place_bar_block": { "name": "Population: 1 - 4 Years", "statVar": "Count_Person_1To4Years" @@ -1203,18 +467,10 @@ "name": "Population: 55 - 64 Years", "statVar": "Count_Person_55To64Years" }, - "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome": { - "name": "Population: African language spoken at home", - "statVar": "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome" - }, "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome_multiple_place_bar_block": { "name": "Population: African language spoken at home", "statVar": "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome" }, - "Count_Person_5OrMoreYears_ArabicSpokenAtHome": { - "name": "Population: Arabic spoken at home", - "statVar": "Count_Person_5OrMoreYears_ArabicSpokenAtHome" - }, "Count_Person_5OrMoreYears_ArabicSpokenAtHome_multiple_place_bar_block": { "name": "Population: Arabic spoken at home", "statVar": "Count_Person_5OrMoreYears_ArabicSpokenAtHome" @@ -1279,10 +535,6 @@ "name": "Population: Korean spoken at home", "statVar": "Count_Person_5OrMoreYears_KoreanSpokenAtHome" }, - "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome": { - "name": "Population: Some language other than English spoken at home", - "statVar": "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome" - }, "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome_1145703171": { "facetId": "1145703171", "name": "Population: Some language other than English spoken at home", @@ -1308,10 +560,6 @@ "name": "Population: Nepali Marathi Or Other Indic Languages Spoken At Home", "statVar": "Count_Person_5OrMoreYears_NepaliMarathiOrOtherIndicLanguagesSpokenAtHome" }, - "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome": { - "name": "Population: English Spoken At Home", - "statVar": "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome" - }, "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome_1145703171": { "facetId": "1145703171", "name": "Population: English Spoken At Home", @@ -1381,10 +629,6 @@ "name": "Population: Yiddish Spoken At Home", "statVar": "Count_Person_5OrMoreYears_YiddishSpokenAtHome" }, - "Count_Person_5To17Years": { - "name": "Population Aged 5 to 17", - "statVar": "Count_Person_5To17Years" - }, "Count_Person_5To17Years_multiple_place_bar_block": { "name": "Population Aged 5 to 17", "statVar": "Count_Person_5To17Years" @@ -1397,28 +641,16 @@ "name": "Population Aged 75 and Up", "statVar": "Count_Person_75OrMoreYears" }, - "Count_Person_85OrMoreYears_Female": { - "name": "Women over 85", - "statVar": "Count_Person_85OrMoreYears_Female" - }, "Count_Person_85OrMoreYears_Female_1145703171": { "facetId": "1145703171", "name": "Women over 85", "statVar": "Count_Person_85OrMoreYears_Female" }, - "Count_Person_85OrMoreYears_Male": { - "name": "Men over 85", - "statVar": "Count_Person_85OrMoreYears_Male" - }, "Count_Person_85OrMoreYears_Male_1145703171": { "facetId": "1145703171", "name": "Men over 85", "statVar": "Count_Person_85OrMoreYears_Male" }, - "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces": { - "name": "American Indian and Alaska Native Population, Monoracial/Multiracial", - "statVar": "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" - }, "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208": { "facetId": "1647577208", "name": "American Indian and Alaska Native Population, Monoracial/Multiracial", @@ -1428,10 +660,6 @@ "name": "Population American Indian or Alaska Native Alone", "statVar": "Count_Person_AmericanIndianAndAlaskaNativeAlone" }, - "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces": { - "name": "Asian Population, Monoracial/Multiracial", - "statVar": "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" - }, "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208": { "facetId": "1647577208", "name": "Asian Population, Monoracial/Multiracial", @@ -1445,10 +673,6 @@ "name": "Population Asian or Pacific Islander", "statVar": "Count_Person_AsianOrPacificIslander" }, - "Count_Person_BlackOrAfricanAmericanAlone": { - "name": "Black Monoracial Population", - "statVar": "Count_Person_BlackOrAfricanAmericanAlone" - }, "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208": { "facetId": "1647577208", "name": "Black Population, Monoracial/Multiracial", @@ -1467,10 +691,6 @@ "name": "Divorcees", "statVar": "Count_Person_Divorced" }, - "Count_Person_Female": { - "name": "Women", - "statVar": "Count_Person_Female" - }, "Count_Person_Female_1145703171": { "facetId": "1145703171", "name": "Women", @@ -1480,18 +700,10 @@ "name": "Hispanic American Indian Population", "statVar": "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" }, - "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone": { - "name": "Hispanic American Indian Population", - "statVar": "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" - }, "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block": { "name": "Hispanic American Indian Population", "statVar": "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" }, - "Count_Person_HispanicOrLatino_AsianAlone": { - "name": "Hispanic Asian Population", - "statVar": "Count_Person_HispanicOrLatino_AsianAlone" - }, "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { "name": "Hispanic Asian Population", "statVar": "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" @@ -1528,10 +740,6 @@ "name": "Hispanic Population", "statVar": "Count_Person_HispanicOrLatino" }, - "Count_Person_Male": { - "name": "Men", - "statVar": "Count_Person_Male" - }, "Count_Person_Male_1145703171": { "facetId": "1145703171", "name": "Men", @@ -1550,10 +758,6 @@ "name": "Non Hispanic Population Identifying as American Indian and Alaska Native, Monoracial/Multiracial", "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" }, - "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone": { - "name": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone", - "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" - }, "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block": { "name": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone", "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" @@ -1603,14 +807,6 @@ "name": "Population Identifying as Some Other Race Alone", "statVar": "Count_Person_SomeOtherRaceAlone" }, - "Count_Person_WhiteAlone": { - "name": "White Monoracial Population", - "statVar": "Count_Person_WhiteAlone" - }, - "Count_Person_WhiteAloneNotHispanicOrLatino": { - "name": "White Hispanic Monoracial Population", - "statVar": "Count_Person_WhiteAloneNotHispanicOrLatino" - }, "Count_Person_WhiteAloneNotHispanicOrLatino_multiple_place_bar_block": { "name": "White Hispanic Monoracial Population", "statVar": "Count_Person_WhiteAloneNotHispanicOrLatino" @@ -1633,19 +829,11 @@ "name": "Median Age of Population", "statVar": "Median_Age_Person" }, - "Median_Age_Person_Female": { - "name": "Women's Median Age", - "statVar": "Median_Age_Person_Female" - }, "Median_Age_Person_Female_3795540742": { "facetId": "3795540742", "name": "Women's Median Age", "statVar": "Median_Age_Person_Female" }, - "Median_Age_Person_Male": { - "name": "Men's Median Age", - "statVar": "Median_Age_Person_Male" - }, "Median_Age_Person_Male_3795540742": { "facetId": "3795540742", "name": "Men's Median Age", @@ -1655,9 +843,6 @@ } ], "metadata": { - "containedPlaceTypes": { - "State": "County" - }, "placeDcid": [ "geoId/06" ] @@ -1682,360 +867,7 @@ } ], "relatedThings": { - "childPlaces": { - "County": [ - { - "dcid": "geoId/06001", - "name": "Alameda", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06003", - "name": "Alpine", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06005", - "name": "Amador", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06007", - "name": "Butte", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06009", - "name": "Calaveras", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06011", - "name": "Colusa", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06013", - "name": "Contra Costa", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06015", - "name": "Del Norte", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06017", - "name": "El Dorado", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06019", - "name": "Fresno", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06021", - "name": "Glenn", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06023", - "name": "Humboldt", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06025", - "name": "Imperial", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06027", - "name": "Inyo", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06029", - "name": "Kern", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06031", - "name": "Kings", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06033", - "name": "Lake", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06035", - "name": "Lassen", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06037", - "name": "Los Angeles", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06039", - "name": "Madera", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06041", - "name": "Marin", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06043", - "name": "Mariposa", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06045", - "name": "Mendocino", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06047", - "name": "Merced", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06049", - "name": "Modoc", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06051", - "name": "Mono", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06053", - "name": "Monterey", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06055", - "name": "Napa", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06057", - "name": "Nevada", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06059", - "name": "Orange", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06061", - "name": "Placer", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06063", - "name": "Plumas", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06065", - "name": "Riverside", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06067", - "name": "Sacramento", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06069", - "name": "San Benito", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06071", - "name": "San Bernardino", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06073", - "name": "San Diego", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06075", - "name": "San Francisco", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06077", - "name": "San Joaquin", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06079", - "name": "San Luis Obispo", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06081", - "name": "San Mateo", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06083", - "name": "Santa Barbara", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06085", - "name": "Santa Clara", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06087", - "name": "Santa Cruz", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06089", - "name": "Shasta", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06091", - "name": "Sierra", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06093", - "name": "Siskiyou", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06095", - "name": "Solano", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06097", - "name": "Sonoma", - "types": [ - "County" - ] - }, - { - "dcid": "geoId/06099", - "name": "Stanislaus", - "types": [ - "County" - ] - } - ] - }, + "childPlaces": {}, "childTopics": [ { "dcid": "dc/topic/Age", diff --git a/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json b/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json index 81320ab964..d15f3e6c0a 100644 --- a/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json +++ b/server/integration_tests/test_data/e2e_toolformer_rig_mode/whatistheinfantmortalityrateinmassachusetts/chart_config.json @@ -118,6 +118,39 @@ "startWithDenom": true, "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period)" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" + ], + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of Massachusetts (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" + ], + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of Massachusetts (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "startWithDenom": true, + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of Massachusetts" + }, { "columns": [ { @@ -205,6 +238,39 @@ "denom": "Count_Person", "startWithDenom": true, "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities)" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Upto1Years_CongenitalMalformationsDeformationsChromosomalAbnormalities" + ], + "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities) in Counties of Massachusetts (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Upto1Years_CongenitalMalformationsDeformationsChromosomalAbnormalities" + ], + "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities) in Counties of Massachusetts (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "startWithDenom": true, + "title": "Mortality Events (1 Years or Less): Q00-Q99 ( Congenital Malformations, Deformations and Chromosomal Abnormalities) in Counties of Massachusetts" } ], "statVarSpec": { @@ -240,6 +306,9 @@ } ], "metadata": { + "containedPlaceTypes": { + "State": "County" + }, "placeDcid": [ "geoId/25" ] @@ -264,7 +333,108 @@ } ], "relatedThings": { - "childPlaces": {}, + "childPlaces": { + "County": [ + { + "dcid": "geoId/25001", + "name": "Barnstable", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25003", + "name": "Berkshire", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25005", + "name": "Bristol", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25007", + "name": "Dukes", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25009", + "name": "Essex", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25011", + "name": "Franklin", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25013", + "name": "Hampden", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25015", + "name": "Hampshire", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25017", + "name": "Middlesex", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25019", + "name": "Nantucket", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25021", + "name": "Norfolk", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25023", + "name": "Plymouth", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25025", + "name": "Suffolk", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/25027", + "name": "Worcester", + "types": [ + "County" + ] + } + ] + }, "childTopics": [], "exploreMore": {}, "mainTopics": [ diff --git a/server/integration_tests/test_data/international/query_2/chart_config.json b/server/integration_tests/test_data/international/query_2/chart_config.json index e14a03423b..e62f45e80d 100644 --- a/server/integration_tests/test_data/international/query_2/chart_config.json +++ b/server/integration_tests/test_data/international/query_2/chart_config.json @@ -4,6 +4,37 @@ "categories": [ { "blocks": [ + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "LifeExpectancy_Person" + ], + "title": "Life Expectancy in Administrative Area 1 Places of China (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "LifeExpectancy_Person" + ], + "title": "Life Expectancy in Administrative Area 1 Places of China (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Life Expectancy in Administrative Area 1 Places of China" + }, { "columns": [ { @@ -32,6 +63,70 @@ ], "title": "Life Expectancy" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "LifeExpectancy_Person_Female" + ], + "title": "Female Life Expectancy in Administrative Area 1 Places of China (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "LifeExpectancy_Person_Female" + ], + "title": "Female Life Expectancy in Administrative Area 1 Places of China (${date})", + "type": "RANKING" + } + ] + } + ], + "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", + "title": "Female Life Expectancy in Administrative Area 1 Places of China" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "LifeExpectancy_Person_Male" + ], + "title": "Male Life Expectancy in Administrative Area 1 Places of China (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "LifeExpectancy_Person_Male" + ], + "title": "Male Life Expectancy in Administrative Area 1 Places of China (${date})", + "type": "RANKING" + } + ] + } + ], + "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", + "title": "Male Life Expectancy in Administrative Area 1 Places of China" + }, { "columns": [ { @@ -67,6 +162,37 @@ "denom": "Count_Person", "title": "Deaths" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_AsAFractionOfCount_Person" + ], + "title": "Deaths Per Capita in Administrative Area 1 Places of China (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_AsAFractionOfCount_Person" + ], + "title": "Deaths Per Capita in Administrative Area 1 Places of China (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Deaths Per Capita in Administrative Area 1 Places of China" + }, { "columns": [ { @@ -542,6 +668,9 @@ } ], "metadata": { + "containedPlaceTypes": { + "Country": "AdministrativeArea1" + }, "placeDcid": [ "country/CHN" ] @@ -556,23 +685,7 @@ "name": "China", "place_type": "Country" }, - "placeFallback": { - "newPlace": { - "country": "country/CHN", - "dcid": "country/CHN", - "name": "China", - "place_type": "Country" - }, - "newStr": "China", - "origPlace": { - "country": "country/CHN", - "dcid": "country/CHN", - "name": "China", - "place_type": "Country" - }, - "origStr": "administrative area 1 places in China", - "origType": "AdministrativeArea1" - }, + "placeFallback": {}, "placeSource": "CURRENT_QUERY", "places": [ { @@ -582,7 +695,241 @@ } ], "relatedThings": { - "childPlaces": {}, + "childPlaces": { + "AdministrativeArea1": [ + { + "dcid": "country/MAC", + "name": "Macau", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q11725", + "name": "Chongqing", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q11736", + "name": "Tianjin", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q15175", + "name": "Guangdong", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q15176", + "name": "Guangxi Zhuang Autonomous Region", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q16963", + "name": "Jiangsu", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q16967", + "name": "Zhejiang", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q17269", + "name": "Tibet Autonomous Region", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q19206", + "name": "Heilongjiang", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q19770", + "name": "Sichuan", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q21208", + "name": "Hebei", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q34800", + "name": "Xinjiang", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q40956", + "name": "Anhui", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q41079", + "name": "Inner Mongolia", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q41705", + "name": "Fujian", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q42200", + "name": "Hainan", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q42392", + "name": "Gansu", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q43194", + "name": "Yunnan", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q43407", + "name": "Shandong", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q43684", + "name": "Henan", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q43934", + "name": "Liaoning", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q45208", + "name": "Jilin", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q45761", + "name": "Hunan", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q45833", + "name": "Qinghai", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q46862", + "name": "Hubei", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q46913", + "name": "Shanxi", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q47097", + "name": "Guizhou", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q47974", + "name": "Shaanxi", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q57052", + "name": "Jiangxi", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q57251", + "name": "Taiwan Province, People's Republic of China", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q57448", + "name": "Ningxia Hui Autonomous Region", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q8686", + "name": "Shanghai", + "types": [ + "AdministrativeArea1" + ] + }, + { + "dcid": "wikidataId/Q956", + "name": "Beijing", + "types": [ + "AdministrativeArea1" + ] + } + ] + }, "childTopics": [], "exploreMore": { "LifeExpectancy_Person": { @@ -611,7 +958,106 @@ ] } ], - "peerPlaces": [], + "peerPlaces": [ + { + "dcid": "country/BRA", + "name": "Brazil", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CAN", + "name": "Canada", + "types": [ + "Country" + ] + }, + { + "dcid": "country/EGY", + "name": "Egypt", + "types": [ + "Country" + ] + }, + { + "dcid": "country/FRA", + "name": "France", + "types": [ + "Country" + ] + }, + { + "dcid": "country/DEU", + "name": "Germany", + "types": [ + "Country" + ] + }, + { + "dcid": "country/IND", + "name": "India", + "types": [ + "Country" + ] + }, + { + "dcid": "country/JPN", + "name": "Japan", + "types": [ + "Country" + ] + }, + { + "dcid": "country/MYS", + "name": "Malaysia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/NZL", + "name": "New Zealand", + "types": [ + "Country" + ] + }, + { + "dcid": "country/NGA", + "name": "Nigeria", + "types": [ + "Country" + ] + }, + { + "dcid": "country/PER", + "name": "Peru", + "types": [ + "Country" + ] + }, + { + "dcid": "country/RUS", + "name": "Russia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/GBR", + "name": "United Kingdom", + "types": [ + "Country" + ] + }, + { + "dcid": "country/USA", + "name": "United States", + "types": [ + "Country" + ] + } + ], "peerTopics": [ { "dcid": "dc/topic/CausesOfDeath", @@ -630,8 +1076,6 @@ ] }, "svSource": "CURRENT_QUERY", - "userMessage": "Sorry, there were no relevant statistics for administrative area 1 places in China. See results for China.", - "userMessages": [ - "Sorry, there were no relevant statistics for administrative area 1 places in China. See results for China." - ] + "userMessage": "", + "userMessages": [] } \ No newline at end of file From 599810414c5a91ef77e19f2bae682687eb016f69 Mon Sep 17 00:00:00 2001 From: Hareesh MS Date: Tue, 2 Jul 2024 14:19:26 +0000 Subject: [PATCH 4/8] update golden --- .../debug_info.json | 16 +- .../debug_info.json | 8 +- .../chart_config.json | 1372 +++++++++++++++-- .../chart_config.json | 891 +++++++---- 4 files changed, 1870 insertions(+), 417 deletions(-) diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index a27bb8f3cb..6b89e0d314 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -54,7 +54,7 @@ "Parts": [ { "CosineScore": [ - 0.9257857203483582 + 0.9257856011390686 ], "QueryPart": "male population", "SV": [ @@ -80,7 +80,7 @@ "Parts": [ { "CosineScore": [ - 0.911777138710022 + 0.9117770791053772 ], "QueryPart": "male population female", "SV": [ @@ -106,11 +106,11 @@ "Parts": [ { "CosineScore": [ - 0.8034242391586304, - 0.8017653226852417, - 0.775155782699585, - 0.7698014378547668, - 0.7586972713470459 + 0.8034242987632751, + 0.8017653822898865, + 0.7751559019088745, + 0.7698014974594116, + 0.7586973309516907 ], "QueryPart": "male", "SV": [ @@ -123,7 +123,7 @@ }, { "CosineScore": [ - 0.9170329570770264 + 0.9170328974723816 ], "QueryPart": "population female population", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index fe032de717..4a02599850 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999998211860657 + 0.9999998807907104 ], "QueryPart": "drought", "SV": [ @@ -66,9 +66,9 @@ { "CosineScore": [ 0.7942370176315308, - 0.7929014563560486, + 0.792901337146759, 0.7586166858673096, - 0.7583958506584167 + 0.758395791053772 ], "QueryPart": "show climate", "SV": [ @@ -80,7 +80,7 @@ }, { "CosineScore": [ - 0.8665125966072083 + 0.866512656211853 ], "QueryPart": "change drought", "SV": [ diff --git a/server/integration_tests/test_data/e2e_date_range/populationincaliforniaafter2013/chart_config.json b/server/integration_tests/test_data/e2e_date_range/populationincaliforniaafter2013/chart_config.json index 124822d06b..b1b2831337 100644 --- a/server/integration_tests/test_data/e2e_date_range/populationincaliforniaafter2013/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/populationincaliforniaafter2013/chart_config.json @@ -35,6 +35,37 @@ ], "title": "Population" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person" + ], + "title": "Population in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person" + ], + "title": "Population in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Population in Counties of California" + }, { "columns": [ { @@ -97,6 +128,37 @@ ], "title": "Median Age of Population" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Median_Age_Person" + ], + "title": "Median Age of Population in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Median_Age_Person" + ], + "title": "Median Age of Population in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Median Age of Population in Counties of California" + }, { "columns": [ { @@ -117,6 +179,68 @@ ], "title": "Median Age by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Median_Age_Person_Female" + ], + "title": "Women's Median Age in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Median_Age_Person_Female" + ], + "title": "Women's Median Age in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Women's Median Age in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Median_Age_Person_Male" + ], + "title": "Men's Median Age in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Median_Age_Person_Male" + ], + "title": "Men's Median Age in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Men's Median Age in Counties of California" + }, { "columns": [ { @@ -155,74 +279,615 @@ { "tiles": [ { - "lineTileSpec": { - "startDate": "2014" - }, "statVarKey": [ - "Count_Person_85OrMoreYears_Female_1145703171", - "Count_Person_85OrMoreYears_Male_1145703171" + "Count_Person_1To4Years" + ], + "title": "Population: 1-4 Years in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_1To4Years" + ], + "title": "Population: 1-4 Years in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population: 1-4 Years in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_5To17Years" + ], + "title": "Population Aged 5 to 17 in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_5To17Years" + ], + "title": "Population Aged 5 to 17 in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population Aged 5 to 17 in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2014" + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Female_1145703171", + "Count_Person_85OrMoreYears_Male_1145703171" + ], + "title": "Population 85 or Over by Gender in California", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population 85 or Over by Gender" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_85OrMoreYears_Female" + ], + "title": "Women Over 85 in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Female" + ], + "title": "Women Over 85 in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Women Over 85 in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_85OrMoreYears_Male" + ], + "title": "Men Over 85 in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Male" + ], + "title": "Men Over 85 in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Men Over 85 in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2014" + }, + "statVarKey": [ + "Count_Person_Female_1145703171", + "Count_Person_Male_1145703171" + ], + "title": "Population by Gender in California", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population by Gender" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Female" + ], + "title": "Women in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Female" + ], + "title": "Women in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Women in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Male" + ], + "title": "Men in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Male" + ], + "title": "Men in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Men in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "geoId/06" + ], + "statVarKey": [ + "Count_Person_WhiteAlone_multiple_place_bar_block", + "Count_Person_BlackOrAfricanAmericanAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_multiple_place_bar_block", + "Count_Person_AsianAlone_multiple_place_bar_block", + "Count_Person_AmericanIndianAndAlaskaNativeAlone_multiple_place_bar_block", + "Count_Person_AsianOrPacificIslander_multiple_place_bar_block", + "Count_Person_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", + "Count_Person_SomeOtherRaceAlone_multiple_place_bar_block" + ], + "title": "Monoracial Breakdown in California (${date})", + "type": "BAR" + } + ] + } + ], + "denom": "Count_Person", + "title": "Monoracial Breakdown" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_WhiteAlone" + ], + "title": "White Monoracial Population in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_WhiteAlone" + ], + "title": "White Monoracial Population in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "White Monoracial Population in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_BlackOrAfricanAmericanAlone" + ], + "title": "Black Monoracial Population in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_BlackOrAfricanAmericanAlone" + ], + "title": "Black Monoracial Population in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Black Monoracial Population in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2014" + }, + "statVarKey": [ + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", + "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", + "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", + "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208" + ], + "title": "Monoracial/multiracial Breakdown in California", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Monoracial/multiracial Breakdown" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "Asian Population, Monoracial/Multiracial in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "Asian Population, Monoracial/Multiracial in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Asian Population, Monoracial/Multiracial in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "geoId/06" + ], + "statVarKey": [ + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AsianAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_WhiteAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" + ], + "title": "Racial Breakdown With Hispanic Consideration in California (${date})", + "type": "BAR" + } + ] + } + ], + "denom": "Count_Person", + "title": "Racial Breakdown With Hispanic Consideration" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + ], + "title": "Hispanic American Indian Population in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + ], + "title": "Hispanic American Indian Population in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Hispanic American Indian Population in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_HispanicOrLatino_AsianAlone" + ], + "title": "Hispanic Asian Population in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_HispanicOrLatino_AsianAlone" + ], + "title": "Hispanic Asian Population in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Hispanic Asian Population in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "geoId/06" + ], + "statVarKey": [ + "Count_Person_WhiteAloneNotHispanicOrLatino_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AsianAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" + ], + "title": "Racial Breakdown With Non Hispanic Consideration in California (${date})", + "type": "BAR" + } + ] + } + ], + "denom": "Count_Person", + "title": "Racial Breakdown With Non Hispanic Consideration" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_WhiteAloneNotHispanicOrLatino" ], - "title": "Population 85 or Over by Gender in California", - "type": "LINE" + "title": "White Hispanic Monoracial Population in Counties of California (${date})", + "type": "MAP" } ] - } - ], - "denom": "Count_Person", - "title": "Population 85 or Over by Gender" - }, - { - "columns": [ + }, { "tiles": [ { - "lineTileSpec": { - "startDate": "2014" + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true }, "statVarKey": [ - "Count_Person_Female_1145703171", - "Count_Person_Male_1145703171" + "Count_Person_WhiteAloneNotHispanicOrLatino" ], - "title": "Population by Gender in California", - "type": "LINE" + "title": "White Hispanic Monoracial Population in Counties of California (${date})", + "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Population by Gender" + "title": "White Hispanic Monoracial Population in Counties of California" }, { "columns": [ { "tiles": [ { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "geoId/06" + "statVarKey": [ + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" ], + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, "statVarKey": [ - "Count_Person_WhiteAlone_multiple_place_bar_block", - "Count_Person_BlackOrAfricanAmericanAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_multiple_place_bar_block", - "Count_Person_AsianAlone_multiple_place_bar_block", - "Count_Person_AmericanIndianAndAlaskaNativeAlone_multiple_place_bar_block", - "Count_Person_AsianOrPacificIslander_multiple_place_bar_block", - "Count_Person_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", - "Count_Person_SomeOtherRaceAlone_multiple_place_bar_block" + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" ], - "title": "Monoracial Breakdown in California (${date})", - "type": "BAR" + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in Counties of California (${date})", + "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Monoracial Breakdown" + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in Counties of California" }, { "columns": [ @@ -233,110 +898,81 @@ "startDate": "2014" }, "statVarKey": [ - "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", - "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", - "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", - "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208", - "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208" + "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome_1145703171", + "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome_1145703171" ], - "title": "Monoracial/multiracial Breakdown in California", + "title": "Spoken English at Home in California", "type": "LINE" } ] } ], "denom": "Count_Person", - "title": "Monoracial/multiracial Breakdown" + "title": "Spoken English at Home" }, { "columns": [ { "tiles": [ { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "geoId/06" - ], "statVarKey": [ - "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_AsianAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_WhiteAlone_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" + "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome" ], - "title": "Racial Breakdown With Hispanic Consideration in California (${date})", - "type": "BAR" + "title": "Population: English Spoken at Home in Counties of California (${date})", + "type": "MAP" } ] - } - ], - "denom": "Count_Person", - "title": "Racial Breakdown With Hispanic Consideration" - }, - { - "columns": [ + }, { "tiles": [ { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true }, - "comparisonPlaces": [ - "geoId/06" - ], "statVarKey": [ - "Count_Person_WhiteAloneNotHispanicOrLatino_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_AsianAlone_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", - "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" + "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome" ], - "title": "Racial Breakdown With Non Hispanic Consideration in California (${date})", - "type": "BAR" + "title": "Population: English Spoken at Home in Counties of California (${date})", + "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Racial Breakdown With Non Hispanic Consideration" + "title": "Population: English Spoken at Home in Counties of California" }, { "columns": [ { "tiles": [ { - "lineTileSpec": { - "startDate": "2014" + "statVarKey": [ + "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome" + ], + "title": "Population: Some Language Other Than English Spoken at Home in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true }, "statVarKey": [ - "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome_1145703171", - "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome_1145703171" + "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome" ], - "title": "Spoken English at Home in California", - "type": "LINE" + "title": "Population: Some Language Other Than English Spoken at Home in Counties of California (${date})", + "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Spoken English at Home" + "title": "Population: Some Language Other Than English Spoken at Home in Counties of California" }, { "columns": [ @@ -400,6 +1036,70 @@ "denom": "Count_Person", "title": "Non-English Languages Spoken at Home" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome" + ], + "title": "Population: African Language Spoken at Home in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome" + ], + "title": "Population: African Language Spoken at Home in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population: African Language Spoken at Home in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_5OrMoreYears_ArabicSpokenAtHome" + ], + "title": "Population: Arabic Spoken at Home in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_5OrMoreYears_ArabicSpokenAtHome" + ], + "title": "Population: Arabic Spoken at Home in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population: Arabic Spoken at Home in Counties of California" + }, { "columns": [ { @@ -431,6 +1131,38 @@ ], "denom": "Count_Person", "title": "Divorcees" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Divorced" + ], + "title": "Divorcees in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Divorced" + ], + "title": "Divorcees in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Divorcees in Counties of California" } ], "statVarSpec": { @@ -442,6 +1174,10 @@ "name": "Population Aged 18 to 24 Years", "statVar": "Count_Person_18To24Years" }, + "Count_Person_1To4Years": { + "name": "Population: 1 - 4 Years", + "statVar": "Count_Person_1To4Years" + }, "Count_Person_1To4Years_multiple_place_bar_block": { "name": "Population: 1 - 4 Years", "statVar": "Count_Person_1To4Years" @@ -467,10 +1203,18 @@ "name": "Population: 55 - 64 Years", "statVar": "Count_Person_55To64Years" }, + "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome": { + "name": "Population: African language spoken at home", + "statVar": "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome" + }, "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome_multiple_place_bar_block": { "name": "Population: African language spoken at home", "statVar": "Count_Person_5OrMoreYears_AfricanLanguagesSpokenAtHome" }, + "Count_Person_5OrMoreYears_ArabicSpokenAtHome": { + "name": "Population: Arabic spoken at home", + "statVar": "Count_Person_5OrMoreYears_ArabicSpokenAtHome" + }, "Count_Person_5OrMoreYears_ArabicSpokenAtHome_multiple_place_bar_block": { "name": "Population: Arabic spoken at home", "statVar": "Count_Person_5OrMoreYears_ArabicSpokenAtHome" @@ -535,6 +1279,10 @@ "name": "Population: Korean spoken at home", "statVar": "Count_Person_5OrMoreYears_KoreanSpokenAtHome" }, + "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome": { + "name": "Population: Some language other than English spoken at home", + "statVar": "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome" + }, "Count_Person_5OrMoreYears_LanguageOtherThanEnglishSpokenAtHome_1145703171": { "facetId": "1145703171", "name": "Population: Some language other than English spoken at home", @@ -560,6 +1308,10 @@ "name": "Population: Nepali Marathi Or Other Indic Languages Spoken At Home", "statVar": "Count_Person_5OrMoreYears_NepaliMarathiOrOtherIndicLanguagesSpokenAtHome" }, + "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome": { + "name": "Population: English Spoken At Home", + "statVar": "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome" + }, "Count_Person_5OrMoreYears_OnlyEnglishSpokenAtHome_1145703171": { "facetId": "1145703171", "name": "Population: English Spoken At Home", @@ -629,6 +1381,10 @@ "name": "Population: Yiddish Spoken At Home", "statVar": "Count_Person_5OrMoreYears_YiddishSpokenAtHome" }, + "Count_Person_5To17Years": { + "name": "Population Aged 5 to 17", + "statVar": "Count_Person_5To17Years" + }, "Count_Person_5To17Years_multiple_place_bar_block": { "name": "Population Aged 5 to 17", "statVar": "Count_Person_5To17Years" @@ -641,16 +1397,28 @@ "name": "Population Aged 75 and Up", "statVar": "Count_Person_75OrMoreYears" }, + "Count_Person_85OrMoreYears_Female": { + "name": "Women over 85", + "statVar": "Count_Person_85OrMoreYears_Female" + }, "Count_Person_85OrMoreYears_Female_1145703171": { "facetId": "1145703171", "name": "Women over 85", "statVar": "Count_Person_85OrMoreYears_Female" }, + "Count_Person_85OrMoreYears_Male": { + "name": "Men over 85", + "statVar": "Count_Person_85OrMoreYears_Male" + }, "Count_Person_85OrMoreYears_Male_1145703171": { "facetId": "1145703171", "name": "Men over 85", "statVar": "Count_Person_85OrMoreYears_Male" }, + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces": { + "name": "American Indian and Alaska Native Population, Monoracial/Multiracial", + "statVar": "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + }, "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208": { "facetId": "1647577208", "name": "American Indian and Alaska Native Population, Monoracial/Multiracial", @@ -660,6 +1428,10 @@ "name": "Population American Indian or Alaska Native Alone", "statVar": "Count_Person_AmericanIndianAndAlaskaNativeAlone" }, + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces": { + "name": "Asian Population, Monoracial/Multiracial", + "statVar": "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + }, "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208": { "facetId": "1647577208", "name": "Asian Population, Monoracial/Multiracial", @@ -673,6 +1445,10 @@ "name": "Population Asian or Pacific Islander", "statVar": "Count_Person_AsianOrPacificIslander" }, + "Count_Person_BlackOrAfricanAmericanAlone": { + "name": "Black Monoracial Population", + "statVar": "Count_Person_BlackOrAfricanAmericanAlone" + }, "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_1647577208": { "facetId": "1647577208", "name": "Black Population, Monoracial/Multiracial", @@ -691,6 +1467,10 @@ "name": "Divorcees", "statVar": "Count_Person_Divorced" }, + "Count_Person_Female": { + "name": "Women", + "statVar": "Count_Person_Female" + }, "Count_Person_Female_1145703171": { "facetId": "1145703171", "name": "Women", @@ -700,10 +1480,18 @@ "name": "Hispanic American Indian Population", "statVar": "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" }, + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone": { + "name": "Hispanic American Indian Population", + "statVar": "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + }, "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block": { "name": "Hispanic American Indian Population", "statVar": "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" }, + "Count_Person_HispanicOrLatino_AsianAlone": { + "name": "Hispanic Asian Population", + "statVar": "Count_Person_HispanicOrLatino_AsianAlone" + }, "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { "name": "Hispanic Asian Population", "statVar": "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" @@ -740,6 +1528,10 @@ "name": "Hispanic Population", "statVar": "Count_Person_HispanicOrLatino" }, + "Count_Person_Male": { + "name": "Men", + "statVar": "Count_Person_Male" + }, "Count_Person_Male_1145703171": { "facetId": "1145703171", "name": "Men", @@ -758,6 +1550,10 @@ "name": "Non Hispanic Population Identifying as American Indian and Alaska Native, Monoracial/Multiracial", "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" }, + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone": { + "name": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone", + "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + }, "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block": { "name": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone", "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" @@ -807,6 +1603,14 @@ "name": "Population Identifying as Some Other Race Alone", "statVar": "Count_Person_SomeOtherRaceAlone" }, + "Count_Person_WhiteAlone": { + "name": "White Monoracial Population", + "statVar": "Count_Person_WhiteAlone" + }, + "Count_Person_WhiteAloneNotHispanicOrLatino": { + "name": "White Hispanic Monoracial Population", + "statVar": "Count_Person_WhiteAloneNotHispanicOrLatino" + }, "Count_Person_WhiteAloneNotHispanicOrLatino_multiple_place_bar_block": { "name": "White Hispanic Monoracial Population", "statVar": "Count_Person_WhiteAloneNotHispanicOrLatino" @@ -829,11 +1633,19 @@ "name": "Median Age of Population", "statVar": "Median_Age_Person" }, + "Median_Age_Person_Female": { + "name": "Women's Median Age", + "statVar": "Median_Age_Person_Female" + }, "Median_Age_Person_Female_3795540742": { "facetId": "3795540742", "name": "Women's Median Age", "statVar": "Median_Age_Person_Female" }, + "Median_Age_Person_Male": { + "name": "Men's Median Age", + "statVar": "Median_Age_Person_Male" + }, "Median_Age_Person_Male_3795540742": { "facetId": "3795540742", "name": "Men's Median Age", @@ -843,6 +1655,9 @@ } ], "metadata": { + "containedPlaceTypes": { + "State": "County" + }, "placeDcid": [ "geoId/06" ] @@ -867,7 +1682,360 @@ } ], "relatedThings": { - "childPlaces": {}, + "childPlaces": { + "County": [ + { + "dcid": "geoId/06001", + "name": "Alameda", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06003", + "name": "Alpine", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06005", + "name": "Amador", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06007", + "name": "Butte", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06009", + "name": "Calaveras", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06011", + "name": "Colusa", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06013", + "name": "Contra Costa", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06015", + "name": "Del Norte", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06017", + "name": "El Dorado", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06019", + "name": "Fresno", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06021", + "name": "Glenn", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06023", + "name": "Humboldt", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06025", + "name": "Imperial", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06027", + "name": "Inyo", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06029", + "name": "Kern", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06031", + "name": "Kings", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06033", + "name": "Lake", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06035", + "name": "Lassen", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06037", + "name": "Los Angeles", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06039", + "name": "Madera", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06041", + "name": "Marin", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06043", + "name": "Mariposa", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06045", + "name": "Mendocino", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06047", + "name": "Merced", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06049", + "name": "Modoc", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06051", + "name": "Mono", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06053", + "name": "Monterey", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06055", + "name": "Napa", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06057", + "name": "Nevada", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06059", + "name": "Orange", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06061", + "name": "Placer", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06063", + "name": "Plumas", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06065", + "name": "Riverside", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06067", + "name": "Sacramento", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06069", + "name": "San Benito", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06071", + "name": "San Bernardino", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06073", + "name": "San Diego", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06075", + "name": "San Francisco", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06077", + "name": "San Joaquin", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06079", + "name": "San Luis Obispo", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06081", + "name": "San Mateo", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06083", + "name": "Santa Barbara", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06085", + "name": "Santa Clara", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06087", + "name": "Santa Cruz", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06089", + "name": "Shasta", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06091", + "name": "Sierra", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06093", + "name": "Siskiyou", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06095", + "name": "Solano", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06097", + "name": "Sonoma", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/06099", + "name": "Stanislaus", + "types": [ + "County" + ] + } + ] + }, "childTopics": [ { "dcid": "dc/topic/Age", diff --git a/server/integration_tests/test_data/e2e_fallbacks/lifeexpectancyinuscounties/chart_config.json b/server/integration_tests/test_data/e2e_fallbacks/lifeexpectancyinuscounties/chart_config.json index 0d4eaf1de5..a44dfd5e39 100644 --- a/server/integration_tests/test_data/e2e_fallbacks/lifeexpectancyinuscounties/chart_config.json +++ b/server/integration_tests/test_data/e2e_fallbacks/lifeexpectancyinuscounties/chart_config.json @@ -4,37 +4,6 @@ "categories": [ { "blocks": [ - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "LifeExpectancy_Person" - ], - "title": "Life Expectancy in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "LifeExpectancy_Person" - ], - "title": "Life Expectancy in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Life Expectancy in States of United States" - }, { "columns": [ { @@ -69,31 +38,16 @@ "tiles": [ { "statVarKey": [ - "LifeExpectancy_Person_Female" - ], - "title": "Female Life Expectancy in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "LifeExpectancy_Person_Female" + "LifeExpectancy_Person_Female", + "LifeExpectancy_Person_Male" ], - "title": "Female Life Expectancy in States of United States (${date})", - "type": "RANKING" + "title": "Life Expectancy by Gender in United States", + "type": "LINE" } ] } ], - "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", - "title": "Female Life Expectancy in States of United States" + "title": "Life Expectancy by Gender" }, { "columns": [ @@ -101,9 +55,9 @@ "tiles": [ { "statVarKey": [ - "LifeExpectancy_Person_Male" + "Count_Death" ], - "title": "Male Life Expectancy in States of United States (${date})", + "title": "Deaths in Counties of United States (${date})", "type": "MAP" } ] @@ -116,33 +70,16 @@ "showHighestLowest": true }, "statVarKey": [ - "LifeExpectancy_Person_Male" + "Count_Death" ], - "title": "Male Life Expectancy in States of United States (${date})", + "title": "Deaths in Counties of United States (${date})", "type": "RANKING" } ] } ], - "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", - "title": "Male Life Expectancy in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "LifeExpectancy_Person_Female", - "LifeExpectancy_Person_Male" - ], - "title": "Life Expectancy by Gender in United States", - "type": "LINE" - } - ] - } - ], - "title": "Life Expectancy by Gender" + "denom": "Count_Person", + "title": "Deaths in Counties of United States" }, { "columns": [ @@ -207,9 +144,41 @@ "tiles": [ { "statVarKey": [ - "Count_Death_DiseasesOfTheCirculatorySystem" + "Count_Death_DiseasesOfTheNervousSystem" + ], + "title": "Deaths From Diseases of the Nervous System in Counties of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_DiseasesOfTheNervousSystem" + ], + "title": "Deaths From Diseases of the Nervous System in Counties of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Deaths From Diseases of the Nervous System in Counties of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_DiseasesOfTheRespiratorySystem" ], - "title": "Deaths From Diseases of the Circulatory System in States of United States (${date})", + "title": "Deaths From Diseases of the Respiratory System in Counties of United States (${date})", "type": "MAP" } ] @@ -222,16 +191,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_Death_DiseasesOfTheCirculatorySystem" + "Count_Death_DiseasesOfTheRespiratorySystem" ], - "title": "Deaths From Diseases of the Circulatory System in States of United States (${date})", + "title": "Deaths From Diseases of the Respiratory System in Counties of United States (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Deaths From Diseases of the Circulatory System in States of United States" + "title": "Deaths From Diseases of the Respiratory System in Counties of United States" }, { "columns": [ @@ -274,26 +243,29 @@ "statVarKey": [ "Count_Death_Female" ], - "title": "Count of Mortality Event: Female in United States", - "type": "LINE" + "title": "Count of Mortality Event: Female in Counties of United States (${date})", + "type": "MAP" } ] }, { "tiles": [ { - "description": "Count of Mortality Event: Female in United States", + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, "statVarKey": [ "Count_Death_Female" ], - "title": "Count of Mortality Event: Female in United States", - "type": "HIGHLIGHT" + "title": "Count of Mortality Event: Female in Counties of United States (${date})", + "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Count of Mortality Event: Female" + "title": "Count of Mortality Event: Female in Counties of United States" }, { "columns": [ @@ -301,31 +273,28 @@ "tiles": [ { "statVarKey": [ - "Count_Death_AbnormalNotClassfied_Female" + "Count_Death_Female" ], - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States (${date})", - "type": "MAP" + "title": "Count of Mortality Event: Female in United States", + "type": "LINE" } ] }, { "tiles": [ { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, + "description": "Count of Mortality Event: Female in United States", "statVarKey": [ - "Count_Death_AbnormalNotClassfied_Female" + "Count_Death_Female" ], - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States (${date})", - "type": "RANKING" + "title": "Count of Mortality Event: Female in United States", + "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States" + "title": "Count of Mortality Event: Female" }, { "columns": [ @@ -333,9 +302,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" + "Count_Death_AbnormalNotClassfied_Female" ], - "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States (${date})", + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in Counties of United States (${date})", "type": "MAP" } ] @@ -348,16 +317,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" + "Count_Death_AbnormalNotClassfied_Female" ], - "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States (${date})", + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in Counties of United States (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States" + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in Counties of United States" }, { "columns": [ @@ -426,9 +395,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_Upto1Years_AbnormalNotClassfied" + "Count_Death_Upto1Years" ], - "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States (${date})", + "title": "Count of Mortality Event: 1 Years or Less in Counties of United States (${date})", "type": "MAP" } ] @@ -441,16 +410,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_Death_Upto1Years_AbnormalNotClassfied" + "Count_Death_Upto1Years" ], - "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States (${date})", + "title": "Count of Mortality Event: 1 Years or Less in Counties of United States (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States" + "title": "Count of Mortality Event: 1 Years or Less in Counties of United States" }, { "columns": [ @@ -460,7 +429,7 @@ "statVarKey": [ "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" ], - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States (${date})", + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of United States (${date})", "type": "MAP" } ] @@ -475,14 +444,14 @@ "statVarKey": [ "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" ], - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States (${date})", + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of United States (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States" + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in Counties of United States" }, { "columns": [ @@ -537,95 +506,27 @@ "tiles": [ { "statVarKey": [ - "dc/67ttwfn9dswch" - ], - "title": "Count of Mortality Event (Measured Based on Jurisdiction): Incarcerated in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "dc/67ttwfn9dswch" - ], - "title": "Count of Mortality Event (Measured Based on Jurisdiction): Incarcerated in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Count of Mortality Event (Measured Based on Jurisdiction): Incarcerated in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "dc/3kk4xws30zxlb" - ], - "title": "Mortality Events (Measured Based on Jurisdiction): NPSOther Cause of Death, Incarcerated in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "dc/3kk4xws30zxlb" - ], - "title": "Mortality Events (Measured Based on Jurisdiction): NPSOther Cause of Death, Incarcerated in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Mortality Events (Measured Based on Jurisdiction): NPSOther Cause of Death, Incarcerated in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "dc/3s7lndm5j3wp4" + "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" ], - "title": "Mortality Events (Measured Based on Jurisdiction): Illness or Natural Cause, Incarcerated in States of United States (${date})", - "type": "MAP" + "title": "Mortality Rate (Age Adjusted, Per Capita) in United States", + "type": "LINE" } ] }, { "tiles": [ { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, + "description": "Mortality Rate (Age Adjusted, Per Capita) in United States", "statVarKey": [ - "dc/3s7lndm5j3wp4" + "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" ], - "title": "Mortality Events (Measured Based on Jurisdiction): Illness or Natural Cause, Incarcerated in States of United States (${date})", - "type": "RANKING" + "title": "Mortality Rate (Age Adjusted, Per Capita) in United States", + "type": "HIGHLIGHT" } ] } ], - "denom": "Count_Person", - "title": "Mortality Events (Measured Based on Jurisdiction): Illness or Natural Cause, Incarcerated in States of United States" + "title": "Mortality Rate (Age Adjusted, Per Capita)" }, { "columns": [ @@ -633,9 +534,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States (${date})", + "title": "Average Interval in Months Since Last Live Birth in Counties of United States (${date})", "type": "MAP" } ] @@ -648,15 +549,15 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States (${date})", + "title": "Average Interval in Months Since Last Live Birth in Counties of United States (${date})", "type": "RANKING" } ] } ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States" + "title": "Average Interval in Months Since Last Live Birth in Counties of United States" }, { "columns": [ @@ -664,9 +565,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in United States", + "title": "Male Mortality Rate (Age Adjusted) in United States", "type": "LINE" } ] @@ -674,79 +575,34 @@ { "tiles": [ { - "description": "Mortality Rate (Age Adjusted, Per Capita) in United States", + "description": "Male Mortality Rate (Age Adjusted) in United States", "statVarKey": [ - "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in United States", + "title": "Male Mortality Rate (Age Adjusted) in United States", "type": "HIGHLIGHT" } ] } ], - "title": "Mortality Rate (Age Adjusted, Per Capita)" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" - ], - "title": "Average Interval in Months Since Last Live Birth in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" - ], - "title": "Average Interval in Months Since Last Live Birth in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Average Interval in Months Since Last Live Birth in States of United States" + "title": "Male Mortality Rate (Age Adjusted)" }, { "columns": [ { "tiles": [ { + "description": "Diabetes Mellitus, Per 100,000 in United States", "statVarKey": [ - "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" - ], - "title": "Male Mortality Rate (Age Adjusted) in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" + "WHO/SA_0000001421" ], - "title": "Male Mortality Rate (Age Adjusted) in States of United States (${date})", - "type": "RANKING" + "title": "Diabetes Mellitus, Per 100,000 in United States", + "type": "HIGHLIGHT" } ] } ], - "title": "Male Mortality Rate (Age Adjusted) in States of United States" + "title": "Diabetes Mellitus, Per 100,000" }, { "columns": [ @@ -754,9 +610,9 @@ "tiles": [ { "statVarKey": [ - "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" + "Count_Death_Female_AgeAdjusted_AsAFractionOf_Count_Person_Female" ], - "title": "Male Mortality Rate (Age Adjusted) in United States", + "title": "Female Mortality Rate (Age Adjusted) in United States", "type": "LINE" } ] @@ -764,34 +620,34 @@ { "tiles": [ { - "description": "Male Mortality Rate (Age Adjusted) in United States", + "description": "Female Mortality Rate (Age Adjusted) in United States", "statVarKey": [ - "Count_Death_Male_AgeAdjusted_AsAFractionOf_Count_Person_Male" + "Count_Death_Female_AgeAdjusted_AsAFractionOf_Count_Person_Female" ], - "title": "Male Mortality Rate (Age Adjusted) in United States", + "title": "Female Mortality Rate (Age Adjusted) in United States", "type": "HIGHLIGHT" } ] } ], - "title": "Male Mortality Rate (Age Adjusted)" + "title": "Female Mortality Rate (Age Adjusted)" }, { "columns": [ { "tiles": [ { - "description": "Diabetes Mellitus, Per 100,000 in United States", + "description": "Ischaemic Heart Disease, Per 100,000 in United States", "statVarKey": [ - "WHO/SA_0000001421" + "WHO/SA_0000001425" ], - "title": "Diabetes Mellitus, Per 100,000 in United States", + "title": "Ischaemic Heart Disease, Per 100,000 in United States", "type": "HIGHLIGHT" } ] } ], - "title": "Diabetes Mellitus, Per 100,000" + "title": "Ischaemic Heart Disease, Per 100,000" } ], "statVarSpec": { @@ -819,10 +675,6 @@ "name": "Deaths Per Capita", "statVar": "Count_Death_AsAFractionOfCount_Person" }, - "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female": { - "name": "Female Deaths Due To Certain Conditions Originating in The Perinatal Period", - "statVar": "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" - }, "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Certain Conditions Originating in The Perinatal Period", "statVar": "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" @@ -855,10 +707,6 @@ "name": "Deaths Due To Diseases of The Blood And Blood-forming Organs And Certain Disorders Involving The Immune Mechanism", "statVar": "Count_Death_DiseasesOfBloodAndBloodFormingOrgansAndImmuneDisorders" }, - "Count_Death_DiseasesOfTheCirculatorySystem": { - "name": "Deaths From Diseases of the Circulatory System", - "statVar": "Count_Death_DiseasesOfTheCirculatorySystem" - }, "Count_Death_DiseasesOfTheCirculatorySystem_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Diseases of The Circulatory System", "statVar": "Count_Death_DiseasesOfTheCirculatorySystem_Female" @@ -867,10 +715,22 @@ "name": "Deaths From Diseases of the Circulatory System", "statVar": "Count_Death_DiseasesOfTheCirculatorySystem" }, + "Count_Death_DiseasesOfTheNervousSystem": { + "name": "Deaths From Diseases of the Nervous System", + "statVar": "Count_Death_DiseasesOfTheNervousSystem" + }, + "Count_Death_DiseasesOfTheRespiratorySystem": { + "name": "Deaths From Diseases of the Respiratory System", + "statVar": "Count_Death_DiseasesOfTheRespiratorySystem" + }, "Count_Death_Female": { "name": "Count of Mortality Event: Female", "statVar": "Count_Death_Female" }, + "Count_Death_Female_AgeAdjusted_AsAFractionOf_Count_Person_Female": { + "name": "Female Mortality Rate (Age Adjusted)", + "statVar": "Count_Death_Female_AgeAdjusted_AsAFractionOf_Count_Person_Female" + }, "Count_Death_IntentionalSelfHarm_AsFractionOf_Count_Person_multiple_place_bar_block": { "name": "% of Suicide Events", "statVar": "Count_Death_IntentionalSelfHarm_AsFractionOf_Count_Person" @@ -887,9 +747,9 @@ "name": "Deaths From Neoplasms (Tumors or Abnormal Growths)", "statVar": "Count_Death_Neoplasms" }, - "Count_Death_Upto1Years_AbnormalNotClassfied": { - "name": "Mortality Events (1 Years or Less): Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified)", - "statVar": "Count_Death_Upto1Years_AbnormalNotClassfied" + "Count_Death_Upto1Years": { + "name": "Count of Mortality Event: 1 Years or Less", + "statVar": "Count_Death_Upto1Years" }, "Count_Death_Upto1Years_AbnormalNotClassfied_multiple_place_bar_block": { "name": "Mortality Events (1 Years or Less): Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified)", @@ -951,17 +811,9 @@ "name": "Diabetes Mellitus, Per 100,000", "statVar": "WHO/SA_0000001421" }, - "dc/3kk4xws30zxlb": { - "name": "Mortality Events (Measured Based on Jurisdiction): NPSOther Cause of Death, Incarcerated", - "statVar": "dc/3kk4xws30zxlb" - }, - "dc/3s7lndm5j3wp4": { - "name": "Mortality Events (Measured Based on Jurisdiction): Illness or Natural Cause, Incarcerated", - "statVar": "dc/3s7lndm5j3wp4" - }, - "dc/67ttwfn9dswch": { - "name": "Count of Mortality Event (Measured Based on Jurisdiction): Incarcerated", - "statVar": "dc/67ttwfn9dswch" + "WHO/SA_0000001425": { + "name": "Ischaemic Heart Disease, Per 100,000", + "statVar": "WHO/SA_0000001425" }, "sdg/SH_DYN_IMRT.AGE--Y0__SEX--F": { "name": "Infant mortality rate", @@ -980,7 +832,7 @@ ], "metadata": { "containedPlaceTypes": { - "Country": "State" + "Country": "County" }, "placeDcid": [ "country/USA" @@ -996,24 +848,7 @@ "name": "United States", "place_type": "Country" }, - "placeFallback": { - "newPlace": { - "country": "country/USA", - "dcid": "country/USA", - "name": "United States", - "place_type": "Country" - }, - "newStr": "states in United States", - "newType": "State", - "origPlace": { - "country": "country/USA", - "dcid": "country/USA", - "name": "United States", - "place_type": "Country" - }, - "origStr": "counties in United States", - "origType": "County" - }, + "placeFallback": {}, "placeSource": "CURRENT_QUERY", "places": [ { @@ -1023,7 +858,360 @@ } ], "relatedThings": { - "childPlaces": {}, + "childPlaces": { + "County": [ + { + "dcid": "geoId/01001", + "name": "Autauga", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01003", + "name": "Baldwin", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01005", + "name": "Barbour", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01007", + "name": "Bibb", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01009", + "name": "Blount", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01011", + "name": "Bullock", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01013", + "name": "Butler", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01015", + "name": "Calhoun", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01017", + "name": "Chambers", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01019", + "name": "Cherokee", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01021", + "name": "Chilton", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01023", + "name": "Choctaw", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01025", + "name": "Clarke", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01027", + "name": "Clay", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01029", + "name": "Cleburne", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01031", + "name": "Coffee", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01033", + "name": "Colbert", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01035", + "name": "Conecuh", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01037", + "name": "Coosa", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01039", + "name": "Covington", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01041", + "name": "Crenshaw", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01043", + "name": "Cullman", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01045", + "name": "Dale", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01047", + "name": "Dallas", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01049", + "name": "DeKalb", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01051", + "name": "Elmore", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01053", + "name": "Escambia", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01055", + "name": "Etowah", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01057", + "name": "Fayette", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01059", + "name": "Franklin", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01061", + "name": "Geneva", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01063", + "name": "Greene", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01065", + "name": "Hale", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01067", + "name": "Henry", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01069", + "name": "Houston", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01071", + "name": "Jackson", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01073", + "name": "Jefferson", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01075", + "name": "Lamar", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01077", + "name": "Lauderdale", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01079", + "name": "Lawrence", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01081", + "name": "Lee", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01083", + "name": "Limestone", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01085", + "name": "Lowndes", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01087", + "name": "Macon", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01089", + "name": "Madison", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01091", + "name": "Marengo", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01093", + "name": "Marion", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01095", + "name": "Marshall", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01097", + "name": "Mobile", + "types": [ + "County" + ] + }, + { + "dcid": "geoId/01099", + "name": "Monroe", + "types": [ + "County" + ] + } + ] + }, "childTopics": [], "exploreMore": { "Count_Death": { @@ -1095,7 +1283,106 @@ ] } ], - "peerPlaces": [], + "peerPlaces": [ + { + "dcid": "country/BRA", + "name": "Brazil", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CAN", + "name": "Canada", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CHN", + "name": "China", + "types": [ + "Country" + ] + }, + { + "dcid": "country/EGY", + "name": "Egypt", + "types": [ + "Country" + ] + }, + { + "dcid": "country/FRA", + "name": "France", + "types": [ + "Country" + ] + }, + { + "dcid": "country/DEU", + "name": "Germany", + "types": [ + "Country" + ] + }, + { + "dcid": "country/IND", + "name": "India", + "types": [ + "Country" + ] + }, + { + "dcid": "country/JPN", + "name": "Japan", + "types": [ + "Country" + ] + }, + { + "dcid": "country/MYS", + "name": "Malaysia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/NZL", + "name": "New Zealand", + "types": [ + "Country" + ] + }, + { + "dcid": "country/NGA", + "name": "Nigeria", + "types": [ + "Country" + ] + }, + { + "dcid": "country/PER", + "name": "Peru", + "types": [ + "Country" + ] + }, + { + "dcid": "country/RUS", + "name": "Russia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/GBR", + "name": "United Kingdom", + "types": [ + "Country" + ] + } + ], "peerTopics": [ { "dcid": "dc/topic/CausesOfDeath", @@ -1121,8 +1408,6 @@ ] }, "svSource": "CURRENT_QUERY", - "userMessage": "Sorry, there were no relevant statistics for counties in United States. See results for states in United States.", - "userMessages": [ - "Sorry, there were no relevant statistics for counties in United States. See results for states in United States." - ] + "userMessage": "", + "userMessages": [] } \ No newline at end of file From 241d788065df05d38d52d4161226c949ba31ab50 Mon Sep 17 00:00:00 2001 From: Hareesh MS Date: Wed, 3 Jul 2024 15:29:55 +0000 Subject: [PATCH 5/8] Add new csv file, update NL sentence --- deploy/nl/catalog.yaml | 2 +- .../debug_info.json | 14 +- .../debug_info.json | 6 +- .../chart_config.json | 869 +----------------- .../query_1/chart_config.json | 67 ++ tools/nl/embeddings/input/base/2024_q3.csv | 8 + tools/nl/embeddings/input/base/_preindex.csv | 11 +- tools/nl/embeddings/input/base/sheets_svs.csv | 8 - 8 files changed, 120 insertions(+), 865 deletions(-) create mode 100644 tools/nl/embeddings/input/base/2024_q3.csv diff --git a/deploy/nl/catalog.yaml b/deploy/nl/catalog.yaml index 53bd4f5c1d..0c1e8dee40 100644 --- a/deploy/nl/catalog.yaml +++ b/deploy/nl/catalog.yaml @@ -90,7 +90,7 @@ indexes: base_uae_mem: store_type: MEMORY source_path: ../../tools/nl/embeddings/input/base - embeddings_path: gs://datcom-nl-models/base_uae_mem_2024_07_02_08_45_24/embeddings.csv + embeddings_path: gs://datcom-nl-models/base_uae_mem_2024_07_03_15_01_56/embeddings.csv model: uae-large-v1-model healthcheck_query: "Life expectancy" base_mistral_mem: diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index 6b89e0d314..a3657fe948 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -54,7 +54,7 @@ "Parts": [ { "CosineScore": [ - 0.9257856011390686 + 0.9257855415344238 ], "QueryPart": "male population", "SV": [ @@ -80,7 +80,7 @@ "Parts": [ { "CosineScore": [ - 0.9117770791053772 + 0.911777138710022 ], "QueryPart": "male population female", "SV": [ @@ -106,11 +106,11 @@ "Parts": [ { "CosineScore": [ - 0.8034242987632751, - 0.8017653822898865, - 0.7751559019088745, - 0.7698014974594116, - 0.7586973309516907 + 0.8034242391586304, + 0.8017653226852417, + 0.775155782699585, + 0.7698014378547668, + 0.7586972713470459 ], "QueryPart": "male", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index 4a02599850..c636588921 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999998807907104 + 0.9999997615814209 ], "QueryPart": "drought", "SV": [ @@ -65,8 +65,8 @@ "Parts": [ { "CosineScore": [ - 0.7942370176315308, - 0.792901337146759, + 0.7942368984222412, + 0.7929012775421143, 0.7586166858673096, 0.758395791053772 ], diff --git a/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json b/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json index 8ee35d41bc..fce05fe0f4 100644 --- a/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json @@ -4,37 +4,6 @@ "categories": [ { "blocks": [ - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "LifeExpectancy_Person" - ], - "title": "Life Expectancy in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "LifeExpectancy_Person" - ], - "title": "Life Expectancy in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Life Expectancy in States of United States" - }, { "columns": [ { @@ -66,70 +35,6 @@ ], "title": "Life Expectancy" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "LifeExpectancy_Person_Female" - ], - "title": "Female Life Expectancy in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "LifeExpectancy_Person_Female" - ], - "title": "Female Life Expectancy in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", - "title": "Female Life Expectancy in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "LifeExpectancy_Person_Male" - ], - "title": "Male Life Expectancy in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "LifeExpectancy_Person_Male" - ], - "title": "Male Life Expectancy in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", - "title": "Male Life Expectancy in States of United States" - }, { "columns": [ { @@ -213,38 +118,6 @@ ], "title": "Deaths Per Capita" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_DiseasesOfTheCirculatorySystem" - ], - "title": "Deaths From Diseases of the Circulatory System in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_DiseasesOfTheCirculatorySystem" - ], - "title": "Deaths From Diseases of the Circulatory System in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Deaths From Diseases of the Circulatory System in States of United States" - }, { "columns": [ { @@ -310,70 +183,6 @@ "denom": "Count_Person", "title": "Count of Mortality Event: Female" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_AbnormalNotClassfied_Female" - ], - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_AbnormalNotClassfied_Female" - ], - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" - ], - "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" - ], - "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States" - }, { "columns": [ { @@ -438,70 +247,6 @@ "footnote": "Includes data from the following sources: united nations Inter-agency group for child mortality estimation (UN IGME), 2023.", "title": "Neonatal Mortality Rate" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_Upto1Years_AbnormalNotClassfied" - ], - "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_Upto1Years_AbnormalNotClassfied" - ], - "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" - ], - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" - ], - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States" - }, { "columns": [ { @@ -552,37 +297,6 @@ ], "title": "Infant Mortality Rate by Gender" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" - ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" - ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States" - }, { "columns": [ { @@ -614,68 +328,6 @@ ], "title": "Mortality Rate (Age Adjusted, Per Capita)" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" - ], - "title": "Average Interval in Months Since Last Live Birth in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" - ], - "title": "Average Interval in Months Since Last Live Birth in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Average Interval in Months Since Last Live Birth in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Median_Age_Person" - ], - "title": "Median Age of Population in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Median_Age_Person" - ], - "title": "Median Age of Population in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Median Age of Population in States of United States" - }, { "columns": [ { @@ -718,10 +370,6 @@ "name": "Deaths", "statVar": "Count_Death" }, - "Count_Death_AbnormalNotClassfied_Female": { - "name": "Female Deaths Due To Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified", - "statVar": "Count_Death_AbnormalNotClassfied_Female" - }, "Count_Death_AbnormalNotClassfied_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified", "statVar": "Count_Death_AbnormalNotClassfied_Female" @@ -748,10 +396,6 @@ "name": "Deaths Per Capita", "statVar": "Count_Death_AsAFractionOfCount_Person" }, - "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female": { - "name": "Female Deaths Due To Certain Conditions Originating in The Perinatal Period", - "statVar": "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" - }, "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Certain Conditions Originating in The Perinatal Period", "statVar": "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" @@ -784,10 +428,6 @@ "name": "Deaths Due To Diseases of The Blood And Blood-forming Organs And Certain Disorders Involving The Immune Mechanism", "statVar": "Count_Death_DiseasesOfBloodAndBloodFormingOrgansAndImmuneDisorders" }, - "Count_Death_DiseasesOfTheCirculatorySystem": { - "name": "Deaths From Diseases of the Circulatory System", - "statVar": "Count_Death_DiseasesOfTheCirculatorySystem" - }, "Count_Death_DiseasesOfTheCirculatorySystem_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Diseases of The Circulatory System", "statVar": "Count_Death_DiseasesOfTheCirculatorySystem_Female" @@ -817,18 +457,10 @@ "name": "Deaths From Neoplasms (Tumors or Abnormal Growths)", "statVar": "Count_Death_Neoplasms" }, - "Count_Death_Upto1Years_AbnormalNotClassfied": { - "name": "Mortality Events (1 Years or Less): Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified)", - "statVar": "Count_Death_Upto1Years_AbnormalNotClassfied" - }, "Count_Death_Upto1Years_AbnormalNotClassfied_multiple_place_bar_block": { "name": "Mortality Events (1 Years or Less): Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified)", "statVar": "Count_Death_Upto1Years_AbnormalNotClassfied" }, - "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod": { - "name": "Mortality Events (1 Years or Less): Certain Conditions Originating in The Perinatal Period)", - "statVar": "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" - }, "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod_multiple_place_bar_block": { "name": "Mortality Events (1 Years or Less): Certain Conditions Originating in The Perinatal Period)", "statVar": "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" @@ -870,28 +502,16 @@ "name": "Life Expectancy", "statVar": "LifeExpectancy_Person" }, - "LifeExpectancy_Person_Female": { - "name": "Female Life Expectancy", - "statVar": "LifeExpectancy_Person_Female" - }, "LifeExpectancy_Person_Female_2776657033": { "facetId": "2776657033", "name": "Female Life Expectancy", "statVar": "LifeExpectancy_Person_Female" }, - "LifeExpectancy_Person_Male": { - "name": "Male Life Expectancy", - "statVar": "LifeExpectancy_Person_Male" - }, "LifeExpectancy_Person_Male_2776657033": { "facetId": "2776657033", "name": "Male Life Expectancy", "statVar": "LifeExpectancy_Person_Male" }, - "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth": { - "name": "Average interval in months since last live birth", - "statVar": "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" - }, "Median_Age_Person": { "name": "Median Age of Population", "statVar": "Median_Age_Person" @@ -924,9 +544,6 @@ } ], "metadata": { - "containedPlaceTypes": { - "Country": "State" - }, "placeDcid": [ "country/USA" ] @@ -941,7 +558,23 @@ "name": "United States", "place_type": "Country" }, - "placeFallback": {}, + "placeFallback": { + "newPlace": { + "country": "country/USA", + "dcid": "country/USA", + "name": "United States", + "place_type": "Country" + }, + "newStr": "United States", + "origPlace": { + "country": "country/USA", + "dcid": "country/USA", + "name": "United States", + "place_type": "Country" + }, + "origStr": "states in United States", + "origType": "State" + }, "placeSource": "CURRENT_QUERY", "places": [ { @@ -951,360 +584,7 @@ } ], "relatedThings": { - "childPlaces": { - "State": [ - { - "dcid": "geoId/01", - "name": "Alabama", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/02", - "name": "Alaska", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/04", - "name": "Arizona", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/05", - "name": "Arkansas", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/06", - "name": "California", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/08", - "name": "Colorado", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/09", - "name": "Connecticut", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/10", - "name": "Delaware", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/11", - "name": "District of Columbia", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/12", - "name": "Florida", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/13", - "name": "Georgia", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/15", - "name": "Hawaii", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/16", - "name": "Idaho", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/17", - "name": "Illinois", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/18", - "name": "Indiana", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/19", - "name": "Iowa", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/20", - "name": "Kansas", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/21", - "name": "Kentucky", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/22", - "name": "Louisiana", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/23", - "name": "Maine", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/24", - "name": "Maryland", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/25", - "name": "Massachusetts", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/26", - "name": "Michigan", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/27", - "name": "Minnesota", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/28", - "name": "Mississippi", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/29", - "name": "Missouri", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/30", - "name": "Montana", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/31", - "name": "Nebraska", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/32", - "name": "Nevada", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/33", - "name": "New Hampshire", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/34", - "name": "New Jersey", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/35", - "name": "New Mexico", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/36", - "name": "New York", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/37", - "name": "North Carolina", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/38", - "name": "North Dakota", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/39", - "name": "Ohio", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/40", - "name": "Oklahoma", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/41", - "name": "Oregon", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/42", - "name": "Pennsylvania", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/44", - "name": "Rhode Island", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/45", - "name": "South Carolina", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/46", - "name": "South Dakota", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/47", - "name": "Tennessee", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/48", - "name": "Texas", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/49", - "name": "Utah", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/50", - "name": "Vermont", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/51", - "name": "Virginia", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/53", - "name": "Washington", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/54", - "name": "West Virginia", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/55", - "name": "Wisconsin", - "types": [ - "State" - ] - } - ] - }, + "childPlaces": {}, "childTopics": [], "exploreMore": { "Count_Death": { @@ -1346,6 +626,12 @@ "Count_MortalityEvent_Assault(Homicide)_Female" ] }, + "Count_Death_Neoplasms": { + "age": [ + "Count_Death_Upto1Years_Neoplasms", + "Count_MortalityEvent_AgeNotStated_ICD10/C00-D48" + ] + }, "LifeExpectancy_Person": { "gender": [ "LifeExpectancy_Person_Female", @@ -1378,106 +664,7 @@ ] } ], - "peerPlaces": [ - { - "dcid": "country/BRA", - "name": "Brazil", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CAN", - "name": "Canada", - "types": [ - "Country" - ] - }, - { - "dcid": "country/CHN", - "name": "China", - "types": [ - "Country" - ] - }, - { - "dcid": "country/EGY", - "name": "Egypt", - "types": [ - "Country" - ] - }, - { - "dcid": "country/FRA", - "name": "France", - "types": [ - "Country" - ] - }, - { - "dcid": "country/DEU", - "name": "Germany", - "types": [ - "Country" - ] - }, - { - "dcid": "country/IND", - "name": "India", - "types": [ - "Country" - ] - }, - { - "dcid": "country/JPN", - "name": "Japan", - "types": [ - "Country" - ] - }, - { - "dcid": "country/MYS", - "name": "Malaysia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/NZL", - "name": "New Zealand", - "types": [ - "Country" - ] - }, - { - "dcid": "country/NGA", - "name": "Nigeria", - "types": [ - "Country" - ] - }, - { - "dcid": "country/PER", - "name": "Peru", - "types": [ - "Country" - ] - }, - { - "dcid": "country/RUS", - "name": "Russia", - "types": [ - "Country" - ] - }, - { - "dcid": "country/GBR", - "name": "United Kingdom", - "types": [ - "Country" - ] - } - ], + "peerPlaces": [], "peerTopics": [ { "dcid": "dc/topic/CausesOfDeath", @@ -1503,6 +690,8 @@ ] }, "svSource": "CURRENT_QUERY", - "userMessage": "", - "userMessages": [] + "userMessage": "Sorry, there were no relevant statistics for states in United States. See results for United States.", + "userMessages": [ + "Sorry, there were no relevant statistics for states in United States. See results for United States." + ] } \ No newline at end of file diff --git a/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json b/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json index a2bf5a61ac..c45ee022ec 100644 --- a/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json +++ b/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json @@ -4,6 +4,69 @@ "categories": [ { "blocks": [ + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + ], + "title": "Count of Crash Incidents With Head on Collision in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Count of Crash Incidents With Head on Collision in California", + "statVarKey": [ + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + ], + "title": "Count of Crash Incidents With Head on Collision in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", + "title": "Count of Crash Incidents With Head on Collision" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + ], + "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + ], + "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", + "title": "Count of Crash Incidents With Head on Collision in Counties of California" + }, { "columns": [ { @@ -67,6 +130,10 @@ } ], "statVarSpec": { + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision": { + "name": "Count of crash incidents with head on collision", + "statVar": "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + }, "dc/0gettc3bc60cb": { "name": "Drive alone", "statVar": "dc/0gettc3bc60cb" diff --git a/tools/nl/embeddings/input/base/2024_q3.csv b/tools/nl/embeddings/input/base/2024_q3.csv new file mode 100644 index 0000000000..b3e8ed7cef --- /dev/null +++ b/tools/nl/embeddings/input/base/2024_q3.csv @@ -0,0 +1,8 @@ +dcid,sentence +Count_Person_InvolvedInCrash_Motorists,Number of motorists involved in crash +Count_Person_InvolvedInCrash_MotorVehicleOccupant,Number of motor vehicle occupants involved in crash +Count_Vehicle_InvolvedInCrash_InTransport,Number of vehicles in motion involved in crash +Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision,Number of headon vehicle collisions +Count_VehicleCrashIncident_InvolvedInCrash_SchoolBus,Number of crashes with school buses +Count_VehicleCrashIncident_NationalHighway,Number of vehicle crash incidents occurred on the national highway +Count_VehicleCrashIncident_StateHighway,Number of vehicle crash incidents occurred on the state highway diff --git a/tools/nl/embeddings/input/base/_preindex.csv b/tools/nl/embeddings/input/base/_preindex.csv index 0995d6b705..5e901cce2b 100644 --- a/tools/nl/embeddings/input/base/_preindex.csv +++ b/tools/nl/embeddings/input/base/_preindex.csv @@ -2087,9 +2087,7 @@ Number of countries using ecosystem-based approaches to managing marine areas,dc Number of countries with mechanisms in place to enhance policy coherence of sustainable development,dc/topic/sdg_17.14.1 "Number of countries with migration policies that facilitate orderly, safe, regular and responsible migration and mobility of people",dc/topic/sdg_10.7.2 "Number of countries with nationally determined contributions, long-term strategies, national adaptation plans and adaptation communications, as reported to the secretariat of the United Nations Framework Convention on Climate Change",dc/topic/sdg_13.2.1 -Number of crash incidents occurred on the national highway,Count_VehicleCrashIncident_NationalHighway -Number of crash incidents on US highway,Count_VehicleCrashIncident_USHighway -Number of crash incidents on state highway,Count_VehicleCrashIncident_StateHighway +Number of crashes with school buses,Count_VehicleCrashIncident_InvolvedInCrash_SchoolBus Number of crimes,Count_CriminalActivities_CombinedCrime Number of cyclones,Count_CycloneEvent Number of deaths,Count_Death @@ -2279,6 +2277,7 @@ Number of full time year round workers with earnings,Count_Person_WithEarnings_F Number of gambling establishments in gambling industries,dc/3jr0p7yjw06z9 Number of girls under 4 years old,Count_Person_0To4Years_Female Number of hate crime incidents,Count_CriminalIncidents_IsHateCrime +Number of headon vehicle collisions,Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision Number of heat events,Count_HeatEvent Number of heat waves,Count_HeatWaveEvent Number of hispanic or latino people who reside in college or university student housing,Count_Person_HispanicOrLatino_ResidesInCollegeOrUniversityStudentHousing @@ -2577,11 +2576,9 @@ Number of never married white people,Count_Person_15OrMoreYears_NeverMarried_Whi "Number of new HIV infections per 1,000 uninfected population, by sex, age and key populations",dc/topic/sdg_3.3.1 Number of non US citizens,Count_Person_NotAUSCitizen Number of non family households that have not received food stamps in the past 12 months,Count_Household_WithoutFoodStampsInThePast12Months_NonfamilyHousehold -Number of non motor vehicle occupants involved in crash,Count_Person_InvolvedInCrash_NotMotorVehicleOccupant Number of non white females,Count_Person_Female_NonWhite Number of non white people,Count_Person_NonWhite Number of non-family households,Count_Household_NonfamilyHousehold -Number of non-motorists involved in crash,Count_Person_InvolvedInCrash_NonMotorists Number of nonfamily households that received food stamps in the past 12 months,Count_Household_WithFoodStampsInThePast12Months_NonfamilyHousehold Number of nonfamily households without children and received food stamps in the last 12 months,Count_Household_WithFoodStampsInThePast12Months_WithoutChildrenUnder18_NonfamilyHousehold Number of one race people with disabilities,Count_Person_WithDisability_OneRace @@ -2832,7 +2829,9 @@ Number of urban scheduled caste people,Count_Person_ScheduledCaste_Urban Number of urban scheduled caste people below 6 years,Count_Person_ScheduledCaste_YearsUpto6_Urban Number of urban scheduled tribe people,Count_Person_ScheduledTribe_Urban Number of urban scheduled tribe people below 6 years,Count_Person_ScheduledTribe_YearsUpto6_Urban -Number of vehicles crashed in transport,Count_Vehicle_InvolvedInCrash_InTransport +Number of vehicle crash incidents occurred on the national highway,Count_VehicleCrashIncident_NationalHighway +Number of vehicle crash incidents occurred on the state highway,Count_VehicleCrashIncident_StateHighway +Number of vehicles in motion involved in crash,Count_Vehicle_InvolvedInCrash_InTransport "Number of verified cases of killing, kidnapping, enforced disappearance, arbitrary detention and torture of journalists, associated media personnel, trade unionists and human rights advocates in the previous 12 months",dc/topic/sdg_16.10.1 Number of veterans,Count_Person_Veteran "Number of victims of human trafficking per 100K population, by sex, age and form of exploitation",dc/topic/sdg_16.2.2 diff --git a/tools/nl/embeddings/input/base/sheets_svs.csv b/tools/nl/embeddings/input/base/sheets_svs.csv index 07af5091ac..abfcc0a693 100644 --- a/tools/nl/embeddings/input/base/sheets_svs.csv +++ b/tools/nl/embeddings/input/base/sheets_svs.csv @@ -2370,10 +2370,6 @@ Count_Person_InLaborForce_ResidesInCollegeOrUniversityStudentHousing,Number of L Count_Person_InLaborForce_ResidesInGroupQuarters,Number of Labor Force Participants reside in Group Quarters Count_Person_InLaborForce_ResidesInNoninstitutionalizedGroupQuarters,Number of Labor Force Participants reside in Noninstitutionalized Group Quarters Count_Person_IsInternetUser_PerCapita,percentage of internet users -Count_Person_InvolvedInCrash_Motorists,Number of motorists involved in crash -Count_Person_InvolvedInCrash_MotorVehicleOccupant,Number of motor vehicle occupants involved in crash -Count_Person_InvolvedInCrash_NonMotorists,Number of non-motorists involved in crash -Count_Person_InvolvedInCrash_NotMotorVehicleOccupant,Number of non motor vehicle occupants involved in crash Count_Person_Literate,Number of Literate people Count_Person_Literate_Female,Number of Literate Females Count_Person_Literate_Male,Number of Literate Males @@ -2764,10 +2760,6 @@ Count_ThunderstormWindEvent,Number of thunderstorm wind events Count_TornadoEvent,Number of tornado events Count_TropicalStormEvent,Number of tropical storm events Count_UnemploymentInsuranceClaim_StateUnemploymentInsurance,Number of state unemployment insurance claims -Count_Vehicle_InvolvedInCrash_InTransport,Number of vehicles crashed in transport -Count_VehicleCrashIncident_NationalHighway,Number of crash incidents occurred on the national highway -Count_VehicleCrashIncident_StateHighway,Number of crash incidents on state highway -Count_VehicleCrashIncident_USHighway,Number of crash incidents on US highway Count_VolcanicAshEvent,Number of volcanic events Count_WasteGenerated_Processed_AsAFractionOf_Count_WasteGenerated,Percentage of waste generated that are processed Count_WaterspoutEvent,Number of waterspouts From 4bf05cc70907802445732665be6f2c100f667680 Mon Sep 17 00:00:00 2001 From: Hareesh Date: Wed, 17 Jul 2024 15:34:45 +0000 Subject: [PATCH 6/8] Update embeddings --- deploy/nl/catalog.yaml | 2 +- server/config/nl_page/topic_cache.json | 6 +- .../detection_api_sfr_idx/chart_config.json | 29 +------- .../chart_config.json | 67 +++++++++++++++++++ .../query_1/chart_config.json | 48 ++++++------- tools/nl/embeddings/input/base/2024_q3.csv | 4 +- tools/nl/embeddings/input/base/_preindex.csv | 4 +- 7 files changed, 101 insertions(+), 59 deletions(-) diff --git a/deploy/nl/catalog.yaml b/deploy/nl/catalog.yaml index 0c1e8dee40..870079a9e2 100644 --- a/deploy/nl/catalog.yaml +++ b/deploy/nl/catalog.yaml @@ -90,7 +90,7 @@ indexes: base_uae_mem: store_type: MEMORY source_path: ../../tools/nl/embeddings/input/base - embeddings_path: gs://datcom-nl-models/base_uae_mem_2024_07_03_15_01_56/embeddings.csv + embeddings_path: gs://datcom-nl-models/base_uae_mem_2024_07_16_10_33_10/embeddings.csv model: uae-large-v1-model healthcheck_query: "Life expectancy" base_mistral_mem: diff --git a/server/config/nl_page/topic_cache.json b/server/config/nl_page/topic_cache.json index 1e6514e273..7f146ec007 100644 --- a/server/config/nl_page/topic_cache.json +++ b/server/config/nl_page/topic_cache.json @@ -9816,8 +9816,8 @@ "Asthma" ], "relevantVariableList": [ - "Percent_Person_Children_WithAsthma", - "Percent_Person_WithAsthma" + "Percent_Person_WithAsthma", + "Percent_Person_Children_WithAsthma" ], "typeOf": [ "Topic" @@ -10250,7 +10250,7 @@ "Commute Time" ], "relevantVariableList": [ - "dc/e9gftzl2hm8h9", + "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome", "dc/svpg/dc/topic/CommuteTime_BreakdownbyCommuteTime" ], "typeOf": [ diff --git a/server/integration_tests/test_data/detection_api_sfr_idx/chart_config.json b/server/integration_tests/test_data/detection_api_sfr_idx/chart_config.json index 540029d528..12ec8162dd 100644 --- a/server/integration_tests/test_data/detection_api_sfr_idx/chart_config.json +++ b/server/integration_tests/test_data/detection_api_sfr_idx/chart_config.json @@ -1,10 +1,6 @@ { "childEntityType": "", - "classifications": [ - { - "type": 100 - } - ], + "classifications": [], "client": "test_detect", "comparisonEntities": [], "comparisonVariables": [], @@ -17,26 +13,5 @@ "properties": [], "sessionId": "007_999999999", "test": "unittest", - "variables": [ - "dc/topic/WorkCommute", - "dc/topic/CommuteTime", - "dc/topic/CommuteMode", - "dc/topic/CommuteModeByOccupation", - "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome", - "dc/hbkh95kc7pkb6", - "dc/0gettc3bc60cb", - "dc/topic/sdg_11.4", - "dc/topic/sdg_11.5", - "dc/topic/sdg_8.6.1", - "dc/topic/sdg_8.6", - "dc/topic/sdg_11.3", - "dc/topic/TransportationEmissionsByGas", - "dc/topic/sdg_11.4.1", - "dc/topic/sdg_16.8", - "Annual_Amount_Emissions_Transportation_NonBiogenicEmissionSource_CarbonMonoxide", - "dc/topic/sdg_8.5", - "dc/topic/LandUseAndCoverage", - "dc/topic/sdg_11.5.3", - "dc/topic/sdg_8.4.2" - ] + "variables": [] } \ No newline at end of file diff --git a/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json b/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json index 24b41bc01d..28fb984756 100644 --- a/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json +++ b/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json @@ -64,9 +64,76 @@ ], "denom": "Count_Person", "title": "Drive Alone in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + ], + "title": "Count of Crash Incidents With Head on Collision in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Count of Crash Incidents With Head on Collision in California", + "statVarKey": [ + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + ], + "title": "Count of Crash Incidents With Head on Collision in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", + "title": "Count of Crash Incidents With Head on Collision" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + ], + "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + ], + "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", + "title": "Count of Crash Incidents With Head on Collision in Counties of California" } ], "statVarSpec": { + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision": { + "name": "Count of crash incidents with head on collision", + "statVar": "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + }, "dc/0gettc3bc60cb": { "name": "Drive alone", "statVar": "dc/0gettc3bc60cb" diff --git a/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json b/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json index c45ee022ec..0f74c3c7fc 100644 --- a/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json +++ b/server/integration_tests/test_data/strict_low_confidence/query_1/chart_config.json @@ -10,9 +10,9 @@ "tiles": [ { "statVarKey": [ - "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + "dc/0gettc3bc60cb" ], - "title": "Count of Crash Incidents With Head on Collision in California", + "title": "Drive Alone in California", "type": "LINE" } ] @@ -20,19 +20,18 @@ { "tiles": [ { - "description": "Count of Crash Incidents With Head on Collision in California", + "description": "Drive Alone in California", "statVarKey": [ - "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + "dc/0gettc3bc60cb" ], - "title": "Count of Crash Incidents With Head on Collision in California", + "title": "Drive Alone in California", "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", - "title": "Count of Crash Incidents With Head on Collision" + "title": "Drive Alone" }, { "columns": [ @@ -40,9 +39,9 @@ "tiles": [ { "statVarKey": [ - "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + "dc/0gettc3bc60cb" ], - "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", + "title": "Drive Alone in Counties of California (${date})", "type": "MAP" } ] @@ -55,17 +54,16 @@ "showHighestLowest": true }, "statVarKey": [ - "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" + "dc/0gettc3bc60cb" ], - "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", + "title": "Drive Alone in Counties of California (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", - "title": "Count of Crash Incidents With Head on Collision in Counties of California" + "title": "Drive Alone in Counties of California" }, { "columns": [ @@ -73,9 +71,9 @@ "tiles": [ { "statVarKey": [ - "dc/0gettc3bc60cb" + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" ], - "title": "Drive Alone in California", + "title": "Count of Crash Incidents With Head on Collision in California", "type": "LINE" } ] @@ -83,18 +81,19 @@ { "tiles": [ { - "description": "Drive Alone in California", + "description": "Count of Crash Incidents With Head on Collision in California", "statVarKey": [ - "dc/0gettc3bc60cb" + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" ], - "title": "Drive Alone in California", + "title": "Count of Crash Incidents With Head on Collision in California", "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Drive Alone" + "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", + "title": "Count of Crash Incidents With Head on Collision" }, { "columns": [ @@ -102,9 +101,9 @@ "tiles": [ { "statVarKey": [ - "dc/0gettc3bc60cb" + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" ], - "title": "Drive Alone in Counties of California (${date})", + "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", "type": "MAP" } ] @@ -117,16 +116,17 @@ "showHighestLowest": true }, "statVarKey": [ - "dc/0gettc3bc60cb" + "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" ], - "title": "Drive Alone in Counties of California (${date})", + "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", "type": "RANKING" } ] } ], "denom": "Count_Person", - "title": "Drive Alone in Counties of California" + "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", + "title": "Count of Crash Incidents With Head on Collision in Counties of California" } ], "statVarSpec": { diff --git a/tools/nl/embeddings/input/base/2024_q3.csv b/tools/nl/embeddings/input/base/2024_q3.csv index b3e8ed7cef..7a6956529a 100644 --- a/tools/nl/embeddings/input/base/2024_q3.csv +++ b/tools/nl/embeddings/input/base/2024_q3.csv @@ -1,8 +1,8 @@ dcid,sentence Count_Person_InvolvedInCrash_Motorists,Number of motorists involved in crash Count_Person_InvolvedInCrash_MotorVehicleOccupant,Number of motor vehicle occupants involved in crash -Count_Vehicle_InvolvedInCrash_InTransport,Number of vehicles in motion involved in crash -Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision,Number of headon vehicle collisions +Count_Vehicle_InvolvedInCrash_InTransport,Number of moving vehicles involved in crash +Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision,Number of head-on collision vehicle crash Count_VehicleCrashIncident_InvolvedInCrash_SchoolBus,Number of crashes with school buses Count_VehicleCrashIncident_NationalHighway,Number of vehicle crash incidents occurred on the national highway Count_VehicleCrashIncident_StateHighway,Number of vehicle crash incidents occurred on the state highway diff --git a/tools/nl/embeddings/input/base/_preindex.csv b/tools/nl/embeddings/input/base/_preindex.csv index 5e901cce2b..6e1962a26a 100644 --- a/tools/nl/embeddings/input/base/_preindex.csv +++ b/tools/nl/embeddings/input/base/_preindex.csv @@ -2277,7 +2277,7 @@ Number of full time year round workers with earnings,Count_Person_WithEarnings_F Number of gambling establishments in gambling industries,dc/3jr0p7yjw06z9 Number of girls under 4 years old,Count_Person_0To4Years_Female Number of hate crime incidents,Count_CriminalIncidents_IsHateCrime -Number of headon vehicle collisions,Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision +Number of head-on collision vehicle crash,Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision Number of heat events,Count_HeatEvent Number of heat waves,Count_HeatWaveEvent Number of hispanic or latino people who reside in college or university student housing,Count_Person_HispanicOrLatino_ResidesInCollegeOrUniversityStudentHousing @@ -2541,6 +2541,7 @@ Number of married white people,Count_Person_15OrMoreYears_MarriedAndNotSeparated Number of mobile phone subscriptions per person,Count_Product_MobileCellularSubscription_AsFractionOf_Count_Person Number of motor vehicle occupants involved in crash,Count_Person_InvolvedInCrash_MotorVehicleOccupant Number of motorists involved in crash,Count_Person_InvolvedInCrash_Motorists +Number of moving vehicles involved in crash,Count_Vehicle_InvolvedInCrash_InTransport Number of multi race people with disabilities,Count_Person_WithDisability_TwoOrMoreRaces Number of multi races farmers,Count_Person_Producer_TwoOrMoreRaces Number of multi races female With Bachelor or higher Degree,dc/hyfn2tlyz48lb @@ -2831,7 +2832,6 @@ Number of urban scheduled tribe people,Count_Person_ScheduledTribe_Urban Number of urban scheduled tribe people below 6 years,Count_Person_ScheduledTribe_YearsUpto6_Urban Number of vehicle crash incidents occurred on the national highway,Count_VehicleCrashIncident_NationalHighway Number of vehicle crash incidents occurred on the state highway,Count_VehicleCrashIncident_StateHighway -Number of vehicles in motion involved in crash,Count_Vehicle_InvolvedInCrash_InTransport "Number of verified cases of killing, kidnapping, enforced disappearance, arbitrary detention and torture of journalists, associated media personnel, trade unionists and human rights advocates in the previous 12 months",dc/topic/sdg_16.10.1 Number of veterans,Count_Person_Veteran "Number of victims of human trafficking per 100K population, by sex, age and form of exploitation",dc/topic/sdg_16.2.2 From 94a25e1816ee5edfbc48b35dea06b3079d1fd7dc Mon Sep 17 00:00:00 2001 From: Hareesh Date: Wed, 17 Jul 2024 16:07:54 +0000 Subject: [PATCH 7/8] Update embeddings --- .../debug_info.json | 14 +- .../debug_info.json | 14 +- .../debug_info.json | 10 +- .../detection_api_sfr_idx/chart_config.json | 29 +- .../chart_config.json | 869 +++++++++++++++++- .../fulfillment_api_basic/chart_config.json | 34 +- .../chart_config.json | 68 +- 7 files changed, 935 insertions(+), 103 deletions(-) diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index a3657fe948..562ccbe85b 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -54,7 +54,7 @@ "Parts": [ { "CosineScore": [ - 0.9257855415344238 + 0.9257857203483582 ], "QueryPart": "male population", "SV": [ @@ -106,11 +106,11 @@ "Parts": [ { "CosineScore": [ - 0.8034242391586304, - 0.8017653226852417, - 0.775155782699585, - 0.7698014378547668, - 0.7586972713470459 + 0.8034242987632751, + 0.8017653822898865, + 0.7751559019088745, + 0.7698014974594116, + 0.7586973309516907 ], "QueryPart": "male", "SV": [ @@ -123,7 +123,7 @@ }, { "CosineScore": [ - 0.9170328974723816 + 0.9170329570770264 ], "QueryPart": "population female population", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json index e304e2fc8a..d28c88abc3 100644 --- a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json @@ -46,14 +46,14 @@ "Parts": [ { "CosineScore": [ - 0.7526575922966003, - 0.7335994243621826, - 0.7317348718643188, - 0.7282766699790955, - 0.7210123538970947, - 0.7188708186149597, + 0.7526575326919556, + 0.7335994839668274, + 0.7317348122596741, + 0.7282767295837402, + 0.72101229429245, + 0.7188706994056702, 0.7138627171516418, - 0.7071599960327148 + 0.7071598172187805 ], "QueryPart": "factors like obesity blood pressure asthma impacted", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index c636588921..fe032de717 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999997615814209 + 0.9999998211860657 ], "QueryPart": "drought", "SV": [ @@ -65,10 +65,10 @@ "Parts": [ { "CosineScore": [ - 0.7942368984222412, - 0.7929012775421143, + 0.7942370176315308, + 0.7929014563560486, 0.7586166858673096, - 0.758395791053772 + 0.7583958506584167 ], "QueryPart": "show climate", "SV": [ @@ -80,7 +80,7 @@ }, { "CosineScore": [ - 0.866512656211853 + 0.8665125966072083 ], "QueryPart": "change drought", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_sfr_idx/chart_config.json b/server/integration_tests/test_data/detection_api_sfr_idx/chart_config.json index 12ec8162dd..540029d528 100644 --- a/server/integration_tests/test_data/detection_api_sfr_idx/chart_config.json +++ b/server/integration_tests/test_data/detection_api_sfr_idx/chart_config.json @@ -1,6 +1,10 @@ { "childEntityType": "", - "classifications": [], + "classifications": [ + { + "type": 100 + } + ], "client": "test_detect", "comparisonEntities": [], "comparisonVariables": [], @@ -13,5 +17,26 @@ "properties": [], "sessionId": "007_999999999", "test": "unittest", - "variables": [] + "variables": [ + "dc/topic/WorkCommute", + "dc/topic/CommuteTime", + "dc/topic/CommuteMode", + "dc/topic/CommuteModeByOccupation", + "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome", + "dc/hbkh95kc7pkb6", + "dc/0gettc3bc60cb", + "dc/topic/sdg_11.4", + "dc/topic/sdg_11.5", + "dc/topic/sdg_8.6.1", + "dc/topic/sdg_8.6", + "dc/topic/sdg_11.3", + "dc/topic/TransportationEmissionsByGas", + "dc/topic/sdg_11.4.1", + "dc/topic/sdg_16.8", + "Annual_Amount_Emissions_Transportation_NonBiogenicEmissionSource_CarbonMonoxide", + "dc/topic/sdg_8.5", + "dc/topic/LandUseAndCoverage", + "dc/topic/sdg_11.5.3", + "dc/topic/sdg_8.4.2" + ] } \ No newline at end of file diff --git a/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json b/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json index fce05fe0f4..8ee35d41bc 100644 --- a/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json @@ -4,6 +4,37 @@ "categories": [ { "blocks": [ + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "LifeExpectancy_Person" + ], + "title": "Life Expectancy in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "LifeExpectancy_Person" + ], + "title": "Life Expectancy in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Life Expectancy in States of United States" + }, { "columns": [ { @@ -35,6 +66,70 @@ ], "title": "Life Expectancy" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "LifeExpectancy_Person_Female" + ], + "title": "Female Life Expectancy in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "LifeExpectancy_Person_Female" + ], + "title": "Female Life Expectancy in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", + "title": "Female Life Expectancy in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "LifeExpectancy_Person_Male" + ], + "title": "Male Life Expectancy in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "LifeExpectancy_Person_Male" + ], + "title": "Male Life Expectancy in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "description": "Life expectancy at birth indicates the number of years a newborn infant would live if prevailing patterns of mortality at the time of its birth were to stay the same throughout its life. (1) united nations population division. World population prospects: 2019 revision. (2) census reports and other statistical publications from national statistical offices, (3) eurostat: demographic statistics, (4) united nations statistical division. Population and vital statistics report (various years), (5) u.S. Census bureau: international database, and (6) secretariat of the pacific community: statistics and demography programme.", + "title": "Male Life Expectancy in States of United States" + }, { "columns": [ { @@ -118,6 +213,38 @@ ], "title": "Deaths Per Capita" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_DiseasesOfTheCirculatorySystem" + ], + "title": "Deaths From Diseases of the Circulatory System in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_DiseasesOfTheCirculatorySystem" + ], + "title": "Deaths From Diseases of the Circulatory System in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Deaths From Diseases of the Circulatory System in States of United States" + }, { "columns": [ { @@ -183,6 +310,70 @@ "denom": "Count_Person", "title": "Count of Mortality Event: Female" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_AbnormalNotClassfied_Female" + ], + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_AbnormalNotClassfied_Female" + ], + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Female Deaths Due to Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" + ], + "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" + ], + "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Female Deaths Due to Certain Conditions Originating in the Perinatal Period in States of United States" + }, { "columns": [ { @@ -247,6 +438,70 @@ "footnote": "Includes data from the following sources: united nations Inter-agency group for child mortality estimation (UN IGME), 2023.", "title": "Neonatal Mortality Rate" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Upto1Years_AbnormalNotClassfied" + ], + "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Upto1Years_AbnormalNotClassfied" + ], + "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Mortality Events (1 Years or Less): Symptoms, Signs and Abnormal Clinical and Laboratory Findings, Not Elsewhere Classified) in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" + ], + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" + ], + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Mortality Events (1 Years or Less): Certain Conditions Originating in the Perinatal Period) in States of United States" + }, { "columns": [ { @@ -297,6 +552,37 @@ ], "title": "Infant Mortality Rate by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + ], + "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_AgeAdjusted_AsAFractionOf_Count_Person" + ], + "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Mortality Rate (Age Adjusted, Per Capita) in States of United States" + }, { "columns": [ { @@ -328,6 +614,68 @@ ], "title": "Mortality Rate (Age Adjusted, Per Capita)" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" + ], + "title": "Average Interval in Months Since Last Live Birth in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" + ], + "title": "Average Interval in Months Since Last Live Birth in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Average Interval in Months Since Last Live Birth in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Median_Age_Person" + ], + "title": "Median Age of Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Median_Age_Person" + ], + "title": "Median Age of Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Median Age of Population in States of United States" + }, { "columns": [ { @@ -370,6 +718,10 @@ "name": "Deaths", "statVar": "Count_Death" }, + "Count_Death_AbnormalNotClassfied_Female": { + "name": "Female Deaths Due To Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified", + "statVar": "Count_Death_AbnormalNotClassfied_Female" + }, "Count_Death_AbnormalNotClassfied_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified", "statVar": "Count_Death_AbnormalNotClassfied_Female" @@ -396,6 +748,10 @@ "name": "Deaths Per Capita", "statVar": "Count_Death_AsAFractionOfCount_Person" }, + "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female": { + "name": "Female Deaths Due To Certain Conditions Originating in The Perinatal Period", + "statVar": "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" + }, "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Certain Conditions Originating in The Perinatal Period", "statVar": "Count_Death_CertainConditionsOriginatingInThePerinatalPeriod_Female" @@ -428,6 +784,10 @@ "name": "Deaths Due To Diseases of The Blood And Blood-forming Organs And Certain Disorders Involving The Immune Mechanism", "statVar": "Count_Death_DiseasesOfBloodAndBloodFormingOrgansAndImmuneDisorders" }, + "Count_Death_DiseasesOfTheCirculatorySystem": { + "name": "Deaths From Diseases of the Circulatory System", + "statVar": "Count_Death_DiseasesOfTheCirculatorySystem" + }, "Count_Death_DiseasesOfTheCirculatorySystem_Female_multiple_place_bar_block": { "name": "Female Deaths Due To Diseases of The Circulatory System", "statVar": "Count_Death_DiseasesOfTheCirculatorySystem_Female" @@ -457,10 +817,18 @@ "name": "Deaths From Neoplasms (Tumors or Abnormal Growths)", "statVar": "Count_Death_Neoplasms" }, + "Count_Death_Upto1Years_AbnormalNotClassfied": { + "name": "Mortality Events (1 Years or Less): Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified)", + "statVar": "Count_Death_Upto1Years_AbnormalNotClassfied" + }, "Count_Death_Upto1Years_AbnormalNotClassfied_multiple_place_bar_block": { "name": "Mortality Events (1 Years or Less): Symptoms, Signs And Abnormal Clinical And Laboratory Findings, Not Elsewhere Classified)", "statVar": "Count_Death_Upto1Years_AbnormalNotClassfied" }, + "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod": { + "name": "Mortality Events (1 Years or Less): Certain Conditions Originating in The Perinatal Period)", + "statVar": "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" + }, "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod_multiple_place_bar_block": { "name": "Mortality Events (1 Years or Less): Certain Conditions Originating in The Perinatal Period)", "statVar": "Count_Death_Upto1Years_CertainConditionsOriginatingInThePerinatalPeriod" @@ -502,16 +870,28 @@ "name": "Life Expectancy", "statVar": "LifeExpectancy_Person" }, + "LifeExpectancy_Person_Female": { + "name": "Female Life Expectancy", + "statVar": "LifeExpectancy_Person_Female" + }, "LifeExpectancy_Person_Female_2776657033": { "facetId": "2776657033", "name": "Female Life Expectancy", "statVar": "LifeExpectancy_Person_Female" }, + "LifeExpectancy_Person_Male": { + "name": "Male Life Expectancy", + "statVar": "LifeExpectancy_Person_Male" + }, "LifeExpectancy_Person_Male_2776657033": { "facetId": "2776657033", "name": "Male Life Expectancy", "statVar": "LifeExpectancy_Person_Male" }, + "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth": { + "name": "Average interval in months since last live birth", + "statVar": "Mean_IntervalSinceLastBirth_BirthEvent_LiveBirth" + }, "Median_Age_Person": { "name": "Median Age of Population", "statVar": "Median_Age_Person" @@ -544,6 +924,9 @@ } ], "metadata": { + "containedPlaceTypes": { + "Country": "State" + }, "placeDcid": [ "country/USA" ] @@ -558,23 +941,7 @@ "name": "United States", "place_type": "Country" }, - "placeFallback": { - "newPlace": { - "country": "country/USA", - "dcid": "country/USA", - "name": "United States", - "place_type": "Country" - }, - "newStr": "United States", - "origPlace": { - "country": "country/USA", - "dcid": "country/USA", - "name": "United States", - "place_type": "Country" - }, - "origStr": "states in United States", - "origType": "State" - }, + "placeFallback": {}, "placeSource": "CURRENT_QUERY", "places": [ { @@ -584,7 +951,360 @@ } ], "relatedThings": { - "childPlaces": {}, + "childPlaces": { + "State": [ + { + "dcid": "geoId/01", + "name": "Alabama", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/02", + "name": "Alaska", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/04", + "name": "Arizona", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/05", + "name": "Arkansas", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/06", + "name": "California", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/08", + "name": "Colorado", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/09", + "name": "Connecticut", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/10", + "name": "Delaware", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/11", + "name": "District of Columbia", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/12", + "name": "Florida", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/13", + "name": "Georgia", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/15", + "name": "Hawaii", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/16", + "name": "Idaho", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/17", + "name": "Illinois", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/18", + "name": "Indiana", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/19", + "name": "Iowa", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/20", + "name": "Kansas", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/21", + "name": "Kentucky", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/22", + "name": "Louisiana", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/23", + "name": "Maine", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/24", + "name": "Maryland", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/25", + "name": "Massachusetts", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/26", + "name": "Michigan", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/27", + "name": "Minnesota", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/28", + "name": "Mississippi", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/29", + "name": "Missouri", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/30", + "name": "Montana", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/31", + "name": "Nebraska", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/32", + "name": "Nevada", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/33", + "name": "New Hampshire", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/34", + "name": "New Jersey", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/35", + "name": "New Mexico", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/36", + "name": "New York", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/37", + "name": "North Carolina", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/38", + "name": "North Dakota", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/39", + "name": "Ohio", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/40", + "name": "Oklahoma", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/41", + "name": "Oregon", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/42", + "name": "Pennsylvania", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/44", + "name": "Rhode Island", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/45", + "name": "South Carolina", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/46", + "name": "South Dakota", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/47", + "name": "Tennessee", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/48", + "name": "Texas", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/49", + "name": "Utah", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/50", + "name": "Vermont", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/51", + "name": "Virginia", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/53", + "name": "Washington", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/54", + "name": "West Virginia", + "types": [ + "State" + ] + }, + { + "dcid": "geoId/55", + "name": "Wisconsin", + "types": [ + "State" + ] + } + ] + }, "childTopics": [], "exploreMore": { "Count_Death": { @@ -626,12 +1346,6 @@ "Count_MortalityEvent_Assault(Homicide)_Female" ] }, - "Count_Death_Neoplasms": { - "age": [ - "Count_Death_Upto1Years_Neoplasms", - "Count_MortalityEvent_AgeNotStated_ICD10/C00-D48" - ] - }, "LifeExpectancy_Person": { "gender": [ "LifeExpectancy_Person_Female", @@ -664,7 +1378,106 @@ ] } ], - "peerPlaces": [], + "peerPlaces": [ + { + "dcid": "country/BRA", + "name": "Brazil", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CAN", + "name": "Canada", + "types": [ + "Country" + ] + }, + { + "dcid": "country/CHN", + "name": "China", + "types": [ + "Country" + ] + }, + { + "dcid": "country/EGY", + "name": "Egypt", + "types": [ + "Country" + ] + }, + { + "dcid": "country/FRA", + "name": "France", + "types": [ + "Country" + ] + }, + { + "dcid": "country/DEU", + "name": "Germany", + "types": [ + "Country" + ] + }, + { + "dcid": "country/IND", + "name": "India", + "types": [ + "Country" + ] + }, + { + "dcid": "country/JPN", + "name": "Japan", + "types": [ + "Country" + ] + }, + { + "dcid": "country/MYS", + "name": "Malaysia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/NZL", + "name": "New Zealand", + "types": [ + "Country" + ] + }, + { + "dcid": "country/NGA", + "name": "Nigeria", + "types": [ + "Country" + ] + }, + { + "dcid": "country/PER", + "name": "Peru", + "types": [ + "Country" + ] + }, + { + "dcid": "country/RUS", + "name": "Russia", + "types": [ + "Country" + ] + }, + { + "dcid": "country/GBR", + "name": "United Kingdom", + "types": [ + "Country" + ] + } + ], "peerTopics": [ { "dcid": "dc/topic/CausesOfDeath", @@ -690,8 +1503,6 @@ ] }, "svSource": "CURRENT_QUERY", - "userMessage": "Sorry, there were no relevant statistics for states in United States. See results for United States.", - "userMessages": [ - "Sorry, there were no relevant statistics for states in United States. See results for United States." - ] + "userMessage": "", + "userMessages": [] } \ No newline at end of file diff --git a/server/integration_tests/test_data/fulfillment_api_basic/chart_config.json b/server/integration_tests/test_data/fulfillment_api_basic/chart_config.json index 0b5470ca54..482d78177a 100644 --- a/server/integration_tests/test_data/fulfillment_api_basic/chart_config.json +++ b/server/integration_tests/test_data/fulfillment_api_basic/chart_config.json @@ -386,9 +386,9 @@ "tiles": [ { "statVarKey": [ - "dc/e9gftzl2hm8h9" + "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome" ], - "title": "Total Commute Time in Santa Clara County", + "title": "Mean Commute Time: 16 Years or More, Work Commute, Employed, Worked Outside of Home in Santa Clara County", "type": "LINE" } ] @@ -396,19 +396,17 @@ { "tiles": [ { - "description": "Total Commute Time in Santa Clara County", + "description": "Mean Commute Time: 16 Years or More, Work Commute, Employed, Worked Outside of Home in Santa Clara County", "statVarKey": [ - "dc/e9gftzl2hm8h9" + "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome" ], - "title": "Total Commute Time in Santa Clara County", + "title": "Mean Commute Time: 16 Years or More, Work Commute, Employed, Worked Outside of Home in Santa Clara County", "type": "HIGHLIGHT" } ] } ], - "denom": "Count_Person", - "description": "Total time spent on a single commute across all workers.", - "title": "Total Commute Time" + "title": "Mean Commute Time: 16 Years or More, Work Commute, Employed, Worked Outside of Home" }, { "columns": [ @@ -416,9 +414,9 @@ "tiles": [ { "statVarKey": [ - "dc/e9gftzl2hm8h9" + "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome" ], - "title": "Total Commute Time in Cities of Santa Clara County (${date})", + "title": "Mean Commute Time: 16 Years or More, Work Commute, Employed, Worked Outside of Home in Cities of Santa Clara County (${date})", "type": "MAP" } ] @@ -431,17 +429,15 @@ "showHighestLowest": true }, "statVarKey": [ - "dc/e9gftzl2hm8h9" + "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome" ], - "title": "Total Commute Time in Cities of Santa Clara County (${date})", + "title": "Mean Commute Time: 16 Years or More, Work Commute, Employed, Worked Outside of Home in Cities of Santa Clara County (${date})", "type": "RANKING" } ] } ], - "denom": "Count_Person", - "description": "Total time spent on a single commute across all workers.", - "title": "Total Commute Time in Cities of Santa Clara County" + "title": "Mean Commute Time: 16 Years or More, Work Commute, Employed, Worked Outside of Home in Cities of Santa Clara County" }, { "columns": [ @@ -545,6 +541,10 @@ } ], "statVarSpec": { + "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome": { + "name": "Mean Commute Time: 16 Years or More, Work Commute, Employed, Worked Outside of Home", + "statVar": "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome" + }, "dc/0gettc3bc60cb": { "name": "Drive alone", "statVar": "dc/0gettc3bc60cb" @@ -617,10 +617,6 @@ "name": "Population: Worked At Home, Service Occupations", "statVar": "dc/dn2h9yfcgbkg2" }, - "dc/e9gftzl2hm8h9": { - "name": "Total Commute Time", - "statVar": "dc/e9gftzl2hm8h9" - }, "dc/exr9t81en1h34_multiple_place_bar_block": { "name": "Population: 16 Years or More, 25 - 29 Minute, Employed And Working, in Labor Force, Outside of Home", "statVar": "dc/exr9t81en1h34" diff --git a/server/integration_tests/test_data/fulfillment_api_correlation/chart_config.json b/server/integration_tests/test_data/fulfillment_api_correlation/chart_config.json index 4ea5ff8a20..4f4ae2eaee 100644 --- a/server/integration_tests/test_data/fulfillment_api_correlation/chart_config.json +++ b/server/integration_tests/test_data/fulfillment_api_correlation/chart_config.json @@ -14,16 +14,16 @@ }, "statVarKey": [ "dc/0gettc3bc60cb_scatter", - "Percent_Person_Children_WithAsthma_scatter" + "Percent_Person_WithAsthma_scatter" ], - "title": "Drive Alone (${yDate}) Vs. Percent of Children That Have Asthma (${xDate}) in Counties of California", + "title": "Drive Alone (${yDate}) Vs. Asthma (${xDate}) in Counties of California", "type": "SCATTER" } ] } ], "denom": "Count_Person", - "title": "Drive alone vs. Percent of Children That Have Asthma" + "title": "Drive alone vs. Asthma" }, { "columns": [ @@ -62,9 +62,9 @@ "tiles": [ { "statVarKey": [ - "Percent_Person_Children_WithAsthma" + "Percent_Person_WithAsthma" ], - "title": "Percent of Children That Have Asthma in Counties of California (${date})", + "title": "Asthma in Counties of California (${date})", "type": "MAP" } ] @@ -77,15 +77,15 @@ "showHighestLowest": true }, "statVarKey": [ - "Percent_Person_Children_WithAsthma" + "Percent_Person_WithAsthma" ], - "title": "Percent of Children That Have Asthma in Counties of California (${date})", + "title": "Asthma in Counties of California (${date})", "type": "RANKING" } ] } ], - "title": "Percent of Children That Have Asthma in Counties of California" + "title": "Asthma in Counties of California" }, { "columns": [ @@ -97,16 +97,16 @@ }, "statVarKey": [ "dc/6rltk4kf75612_scatter", - "Percent_Person_WithAsthma_scatter" + "Percent_Person_Children_WithAsthma_scatter" ], - "title": "Work at Home (${yDate}) Vs. Asthma (${xDate}) in Counties of California", + "title": "Work at Home (${yDate}) Vs. Percent of Children That Have Asthma (${xDate}) in Counties of California", "type": "SCATTER" } ] } ], "denom": "Count_Person", - "title": "Work at home vs. Asthma" + "title": "Work at home vs. Percent of Children That Have Asthma" }, { "columns": [ @@ -145,9 +145,9 @@ "tiles": [ { "statVarKey": [ - "Percent_Person_WithAsthma" + "Percent_Person_Children_WithAsthma" ], - "title": "Asthma in Counties of California (${date})", + "title": "Percent of Children That Have Asthma in Counties of California (${date})", "type": "MAP" } ] @@ -160,15 +160,15 @@ "showHighestLowest": true }, "statVarKey": [ - "Percent_Person_WithAsthma" + "Percent_Person_Children_WithAsthma" ], - "title": "Asthma in Counties of California (${date})", + "title": "Percent of Children That Have Asthma in Counties of California (${date})", "type": "RANKING" } ] } ], - "title": "Asthma in Counties of California" + "title": "Percent of Children That Have Asthma in Counties of California" }, { "columns": [ @@ -180,16 +180,16 @@ }, "statVarKey": [ "dc/0gettc3bc60cb_scatter", - "Percent_Person_WithAsthma_scatter" + "Percent_Person_Children_WithAsthma_scatter" ], - "title": "Drive Alone (${yDate}) Vs. Asthma (${xDate}) in Counties of California", + "title": "Drive Alone (${yDate}) Vs. Percent of Children That Have Asthma (${xDate}) in Counties of California", "type": "SCATTER" } ] } ], "denom": "Count_Person", - "title": "Drive alone vs. Asthma" + "title": "Drive alone vs. Percent of Children That Have Asthma" }, { "columns": [ @@ -201,16 +201,16 @@ }, "statVarKey": [ "dc/6rltk4kf75612_scatter", - "Percent_Person_Children_WithAsthma_scatter" + "Percent_Person_WithAsthma_scatter" ], - "title": "Work at Home (${yDate}) Vs. Percent of Children That Have Asthma (${xDate}) in Counties of California", + "title": "Work at Home (${yDate}) Vs. Asthma (${xDate}) in Counties of California", "type": "SCATTER" } ] } ], "denom": "Count_Person", - "title": "Work at home vs. Percent of Children That Have Asthma" + "title": "Work at home vs. Asthma" }, { "columns": [ @@ -222,16 +222,16 @@ }, "statVarKey": [ "dc/hbkh95kc7pkb6_scatter", - "Percent_Person_Children_WithAsthma_scatter" + "Percent_Person_WithAsthma_scatter" ], - "title": "Public Transit (${yDate}) Vs. Percent of Children That Have Asthma (${xDate}) in Counties of California", + "title": "Public Transit (${yDate}) Vs. Asthma (${xDate}) in Counties of California", "type": "SCATTER" } ] } ], "denom": "Count_Person", - "title": "Public Transit vs. Percent of Children That Have Asthma" + "title": "Public Transit vs. Asthma" }, { "columns": [ @@ -274,16 +274,16 @@ }, "statVarKey": [ "dc/hbkh95kc7pkb6_scatter", - "Percent_Person_WithAsthma_scatter" + "Percent_Person_Children_WithAsthma_scatter" ], - "title": "Public Transit (${yDate}) Vs. Asthma (${xDate}) in Counties of California", + "title": "Public Transit (${yDate}) Vs. Percent of Children That Have Asthma (${xDate}) in Counties of California", "type": "SCATTER" } ] } ], "denom": "Count_Person", - "title": "Public Transit vs. Asthma" + "title": "Public Transit vs. Percent of Children That Have Asthma" }, { "columns": [ @@ -295,16 +295,16 @@ }, "statVarKey": [ "dc/vp8cbt6k79t94_scatter", - "Percent_Person_Children_WithAsthma_scatter" + "Percent_Person_WithAsthma_scatter" ], - "title": "Walk to Work (${yDate}) Vs. Percent of Children That Have Asthma (${xDate}) in Counties of California", + "title": "Walk to Work (${yDate}) Vs. Asthma (${xDate}) in Counties of California", "type": "SCATTER" } ] } ], "denom": "Count_Person", - "title": "Walk to work vs. Percent of Children That Have Asthma" + "title": "Walk to work vs. Asthma" }, { "columns": [ @@ -347,16 +347,16 @@ }, "statVarKey": [ "dc/vp8cbt6k79t94_scatter", - "Percent_Person_WithAsthma_scatter" + "Percent_Person_Children_WithAsthma_scatter" ], - "title": "Walk to Work (${yDate}) Vs. Asthma (${xDate}) in Counties of California", + "title": "Walk to Work (${yDate}) Vs. Percent of Children That Have Asthma (${xDate}) in Counties of California", "type": "SCATTER" } ] } ], "denom": "Count_Person", - "title": "Walk to work vs. Asthma" + "title": "Walk to work vs. Percent of Children That Have Asthma" } ], "statVarSpec": { From 3a061142fbe65694a5dd4fec3a0af2ecda8518cd Mon Sep 17 00:00:00 2001 From: Hareesh Date: Wed, 17 Jul 2024 17:08:30 +0000 Subject: [PATCH 8/8] update --- .../demo_feb2023/query_1/chart_config.json | 224 ++++++ .../debug_info.json | 20 +- .../compareobesityvs.poverty/debug_info.json | 20 +- .../debug_info.json | 54 +- .../debug_info.json | 6 +- .../chart_config.json | 678 +----------------- .../chart_config.json | 154 ++-- .../chart_config.json | 68 -- .../chart_config.json | 208 +----- 9 files changed, 361 insertions(+), 1071 deletions(-) diff --git a/server/integration_tests/test_data/demo_feb2023/query_1/chart_config.json b/server/integration_tests/test_data/demo_feb2023/query_1/chart_config.json index f52d85dd2c..caeb56ce14 100644 --- a/server/integration_tests/test_data/demo_feb2023/query_1/chart_config.json +++ b/server/integration_tests/test_data/demo_feb2023/query_1/chart_config.json @@ -235,6 +235,214 @@ "description": "Predicted max temperature with 95% chance, at least once in the year, according to a CMIP6 ensemble model as per SSP 585 (pessimistic) scenario.", "footnote": "SSP585 is a pessimistic pathway. It is an update to RCP 8.5 with an additional radiative forcing of 8.5 W/m\u00b2. RCP 8.5 is more likely than not to result in global temperature rise between 3 \u00b0C and 12.6 \u00b0C by 2100.", "title": "Max Temperature (\u00b0C) Once in Year With 95% Chance: SP585 in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Temperature" + ], + "title": "Temperature in a Location in Counties of California (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Temperature" + ], + "title": "Temperature in a Location in Counties of California (${date})", + "type": "MAP" + } + ] + } + ], + "title": "Temperature in a Location in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Mean_Temperature" + ], + "title": "Mean Temperature in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Mean Temperature in California", + "statVarKey": [ + "Mean_Temperature" + ], + "title": "Mean Temperature in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "title": "Mean Temperature" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Mean_Temperature" + ], + "title": "Mean Temperature in Counties of California (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Mean_Temperature" + ], + "title": "Mean Temperature in Counties of California (${date})", + "type": "MAP" + } + ] + } + ], + "title": "Mean Temperature in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Max_Temperature" + ], + "title": "Maximum Temperature in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Maximum Temperature in California", + "statVarKey": [ + "Max_Temperature" + ], + "title": "Maximum Temperature in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "title": "Maximum Temperature" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showHighest": true + }, + "statVarKey": [ + "Max_Temperature" + ], + "title": "Maximum Temperature in Counties of California (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Max_Temperature" + ], + "title": "Maximum Temperature in Counties of California (${date})", + "type": "MAP" + } + ] + } + ], + "title": "Maximum Temperature in Counties of California" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Min_Temperature" + ], + "title": "Min Temperature in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Min Temperature in California", + "statVarKey": [ + "Min_Temperature" + ], + "title": "Min Temperature in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "title": "Min Temperature" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 10, + "showLowest": true + }, + "statVarKey": [ + "Min_Temperature" + ], + "title": "Min Temperature in Counties of California (${date})", + "type": "RANKING" + } + ] + }, + { + "tiles": [ + { + "statVarKey": [ + "Min_Temperature" + ], + "title": "Min Temperature in Counties of California (${date})", + "type": "MAP" + } + ] + } + ], + "title": "Min Temperature in Counties of California" } ], "statVarSpec": { @@ -270,6 +478,22 @@ "name": "Max Temperature (\u00b0C) Once In Year With 95% Chance: SP585", "statVar": "MaxTemp_Daily_Hist_95PctProb_Greater_Atleast1DayAYear_CMIP6_Ensemble_SSP585" }, + "Max_Temperature": { + "name": "Maximum Temperature", + "statVar": "Max_Temperature" + }, + "Mean_Temperature": { + "name": "Mean Temperature", + "statVar": "Mean_Temperature" + }, + "Min_Temperature": { + "name": "Min Temperature", + "statVar": "Min_Temperature" + }, + "Temperature": { + "name": "Temperature in a Location", + "statVar": "Temperature" + }, "ranking-DiffRelativeToAvg_1980_2010_MaxTemp_Daily_Hist_95PctProb_Greater_Atleast1DayADecade_CMIP6_Ensemble_SSP245": { "name": "SSP245 (intermediate), \u00b0C", "statVar": "DiffRelativeToAvg_1980_2010_MaxTemp_Daily_Hist_95PctProb_Greater_Atleast1DayADecade_CMIP6_Ensemble_SSP245" diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index ec2b46b67f..6350885352 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -89,8 +89,8 @@ }, { "CosineScore": [ - 0.8982377648353577, - 0.872346818447113 + 0.8982378244400024, + 0.8723468780517578 ], "QueryPart": "population", "SV": [ @@ -106,11 +106,11 @@ "Parts": [ { "CosineScore": [ - 0.8034242987632751, - 0.8017653822898865, + 0.8034242391586304, + 0.8017652630805969, 0.7751559019088745, - 0.7698014974594116, - 0.7586973309516907 + 0.7698014378547668, + 0.7586972713470459 ], "QueryPart": "male", "SV": [ @@ -123,7 +123,7 @@ }, { "CosineScore": [ - 0.9170329570770264 + 0.9170328974723816 ], "QueryPart": "population female population", "SV": [ @@ -164,6 +164,7 @@ "dc/topic/UrbanFemalePopulationByAge", "Count_Student_Male", "dc/topic/SeparatedFemalePopulationByAge", + "Count_Person_Civilian_Female_NonInstitutionalized", "dc/topic/AsianAloneFemalePopulationByAge", "Count_Person_Female_WithHealthInsurance", "Count_Person_Workers_Male", @@ -171,8 +172,7 @@ "dc/topic/WhiteAloneFemalePopulationByAge", "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female", "Count_Person_3OrMoreYears_Male_EnrolledInSchool", - "dc/topic/MedianHouseholdIncomeByGender", - "Count_Death_Male_AsAFractionOf_Count_Person_Male" + "dc/topic/MedianHouseholdIncomeByGender" ] }, "props_matching": { @@ -196,4 +196,4 @@ "sv_detection_query_stop_words_removal": "male population female population" } } -} +} \ No newline at end of file diff --git a/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json index 8dbe6ad4c9..b2b55e0b16 100644 --- a/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json @@ -43,7 +43,7 @@ "MultiSV": { "Candidates": [ { - "AggCosineScore": 0.9234, + "AggCosineScore": 0.9478, "DelimBased": true, "Parts": [ { @@ -54,9 +54,7 @@ "QueryPart": "obesity", "SV": [ "Percent_Person_Obesity", - "WHO/NCD_BMI_30A", - "dc/4lvmzr1h1ylk1", - "dc/x13tvt8jsgrm4" + "WHO/NCD_BMI_30A" ] }, { @@ -75,34 +73,36 @@ "Query": "compare obesity vs poverty", "SV": [ "dc/topic/Poverty", + "Percent_Person_Obesity", "dc/topic/PovertyByRace", "dc/topic/SDG_1", - "Percent_Person_Obesity", + "WHO/NCD_BMI_30A", "dc/topic/sdg_1.2", "dc/topic/PovertyByGender", "dc/topic/PovertyByLanguageSpokenAtHome", "dc/topic/sdg_1.2.2", "Count_Household_HouseholderAge65OrMoreYears_FamilyHousehold_BelowPovertyLevelInThePast12Months", - "WHO/NCD_BMI_30A", "dc/topic/Malnutrition", "dc/topic/sdg_2.1.1", "sdg/SN_ITK_DEFC", "Count_Household_WithFoodStampsInThePast12Months_BelowPovertyLevelInThePast12Months", "dc/topic/PovertyByResidency", + "dc/4lvmzr1h1ylk1", + "dc/x13tvt8jsgrm4", "dc/topic/sdg_1", "Count_Household_FamilyHousehold_BelowPovertyLevelInThePast12Months", - "dc/x13tvt8jsgrm4", "dc/topic/FoodInsecurity", "dc/topic/sdg_2.1.2", + "WHO/NCD_BMI_18A", "Count_Household_WithoutFoodStampsInThePast12Months_AbovePovertyLevelInThePast12Months", - "dc/4lvmzr1h1ylk1", + "WHO/NUTOVERWEIGHTPREV", "Count_Household_MarriedCoupleFamilyHousehold_BelowPovertyLevelInThePast12Months", "Count_Household_WithFoodStampsInThePast12Months_AbovePovertyLevelInThePast12Months", "dc/topic/HealthEquity", + "WHO/NUTRITION_WA_2", "dc/topic/sdg_1.2.1", "Count_Person_BelowPovertyLevelInThePast12Months_TwoOrMoreRaces", - "Count_Person_Male_AbovePovertyLevelInThePast12Months_TwoOrMoreRaces", - "sdg/SI_POV_DAY1" + "Count_Person_Male_AbovePovertyLevelInThePast12Months_TwoOrMoreRaces" ] }, "props_matching": { diff --git a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json index e568cb54e6..e304e2fc8a 100644 --- a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json @@ -41,23 +41,30 @@ "MultiSV": { "Candidates": [ { - "AggCosineScore": 0.8999, + "AggCosineScore": 0.8763, "DelimBased": false, "Parts": [ { "CosineScore": [ - 0.7526575326919556, - 0.7335994839668274, - 0.7317348122596741, - 0.7282767295837402, - 0.72101229429245, - 0.7188706994056702, + 0.7526575922966003, + 0.7335994243621826, + 0.7317348718643188, + 0.7282766699790955, + 0.7210123538970947, + 0.7188708186149597, 0.7138627171516418, - 0.7071598172187805 + 0.7071599960327148 ], "QueryPart": "factors like obesity blood pressure asthma impacted", "SV": [ - "dc/topic/Asthma" + "Percent_Person_WithAsthma", + "dc/topic/BloodPressure", + "Percent_Person_Children_WithAsthma", + "Percent_Person_Obesity", + "dc/topic/AsthmaMalePopulationByAge", + "dc/topic/AsthmaFemalePopulationByAge", + "dc/topic/HealthConditions", + "dc/topic/Health" ] }, { @@ -72,7 +79,7 @@ ] }, { - "AggCosineScore": 0.8615, + "AggCosineScore": 0.8668, "DelimBased": true, "Parts": [ { @@ -85,9 +92,7 @@ "SV": [ "Percent_Person_Obesity", "WHO/NCD_BMI_30A", - "dc/x13tvt8jsgrm4", - "dc/4lvmzr1h1ylk1", - "dc/topic/Health" + "dc/x13tvt8jsgrm4" ] }, { @@ -105,14 +110,13 @@ ], "QueryPart": "asthma impacted climate change", "SV": [ - "dc/topic/Asthma", "dc/topic/ClimateChange" ] } ] }, { - "AggCosineScore": 0.8413, + "AggCosineScore": 0.8276, "DelimBased": false, "Parts": [ { @@ -125,14 +129,17 @@ 0.7185328006744385, 0.717232882976532, 0.7033888697624207 - ], "QueryPart": "factors like obesity blood pressure asthma", "SV": [ - "dc/topic/Asthma", "dc/topic/BloodPressure", + "Percent_Person_Obesity", + "Percent_Person_WithAsthma", "dc/topic/HealthConditions", - "dc/topic/Health" + "dc/topic/Health", + "WHO/NCD_BMI_30A", + "Percent_Person_Children_WithAsthma", + "dc/x13tvt8jsgrm4" ] }, { @@ -147,7 +154,7 @@ ] }, { - "AggCosineScore": 0.8232, + "AggCosineScore": 0.8118, "DelimBased": false, "Parts": [ { @@ -165,7 +172,6 @@ ], "QueryPart": "asthma impacted climate change", "SV": [ - "dc/topic/Asthma", "dc/topic/ClimateChange" ] } @@ -176,15 +182,16 @@ "Query": "how are factors like obesity , blood pressure and asthma impacted by climate change", "SV": [ "dc/topic/ClimateChange", - "dc/topic/Asthma", "dc/topic/ProjectedClimateExtremes", "dc/topic/BloodPressure", "dc/topic/sdg_13.3", "dc/topic/CO2Emissions", + "Percent_Person_Obesity", "Annual_Emissions_GreenhouseGas", + "Percent_Person_Children_WithAsthma", "dc/topic/AmbientAirPollution", + "Percent_Person_WithAsthma", "Annual_Amount_Emissions_SCC_27_NaturalSources", - "Percent_Person_Obesity", "dc/topic/WHOMortalityCauses", "dc/topic/sdg_3.9.1", "dc/topic/GlobalHealth", @@ -192,15 +199,14 @@ "dc/topic/sdg_13", "dc/topic/sdg_13.b", "dc/topic/sdg_13.2.1", - "Percent_Person_Children_WithAsthma", "dc/topic/sdg_13.2.2", "dc/topic/WHONonCommunicableDiseases", - "Percent_Person_WithAsthma", "dc/topic/Emissions", "dc/topic/Pollutants", "Annual_Emissions_GreenhouseGas_OilAndGas", "dc/topic/GreenhouseGasEmissions", "dc/topic/AsthmaFemalePopulationByAge", + "WHO/NUTOVERWEIGHTPREV", "dc/topic/sdg_13.1", "dc/topic/sdg_13.2", "dc/topic/sdg_11.6.2" diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index fe6162ec5a..e84301f8c5 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999998211860657 + 0.9999998807907104 ], "QueryPart": "drought", "SV": [ @@ -73,7 +73,9 @@ "QueryPart": "show climate", "SV": [ "dc/topic/ProjectedClimateExtremes", - "dc/topic/ClimateChange" + "dc/topic/ClimateChange", + "dc/topic/Temperatures", + "Temperature" ] }, { diff --git a/server/integration_tests/test_data/e2e_edge_cases2/whatcrimesareconsideredfeloniesvs.misdemeanorsintheus/chart_config.json b/server/integration_tests/test_data/e2e_edge_cases2/whatcrimesareconsideredfeloniesvs.misdemeanorsintheus/chart_config.json index 44976d2dc6..12774330e2 100644 --- a/server/integration_tests/test_data/e2e_edge_cases2/whatcrimesareconsideredfeloniesvs.misdemeanorsintheus/chart_config.json +++ b/server/integration_tests/test_data/e2e_edge_cases2/whatcrimesareconsideredfeloniesvs.misdemeanorsintheus/chart_config.json @@ -33,38 +33,6 @@ "denom": "Count_Person", "title": "Criminal Activities" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_CombinedCrime" - ], - "title": "Criminal Activities in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_CombinedCrime" - ], - "title": "Criminal Activities in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Criminal Activities in States of United States" - }, { "columns": [ { @@ -125,277 +93,13 @@ ], "denom": "Count_Person", "title": "Crimes by Type" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_AggravatedAssault" - ], - "title": "Aggravated Assault Cases in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_AggravatedAssault" - ], - "title": "Aggravated Assault Cases in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Aggravated Assault Cases in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_Burglary" - ], - "title": "Burglaries in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_Burglary" - ], - "title": "Burglaries in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Burglaries in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_ForcibleRape" - ], - "title": "Forcible Rapes in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_ForcibleRape" - ], - "title": "Forcible Rapes in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Forcible Rapes in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_LarcenyTheft" - ], - "title": "Larceny Theft Cases in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_LarcenyTheft" - ], - "title": "Larceny Theft Cases in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Larceny Theft Cases in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_MotorVehicleTheft" - ], - "title": "Motor Vehicle Thefts in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_MotorVehicleTheft" - ], - "title": "Motor Vehicle Thefts in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Motor Vehicle Thefts in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_PropertyCrime" - ], - "title": "Property Related Crimes in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_PropertyCrime" - ], - "title": "Property Related Crimes in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Property Related Crimes in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_Robbery" - ], - "title": "Robberies in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_Robbery" - ], - "title": "Robberies in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Robberies in States of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_CriminalActivities_ViolentCrime" - ], - "title": "Violent Crimes in States of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_CriminalActivities_ViolentCrime" - ], - "title": "Violent Crimes in States of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Violent Crimes in States of United States" } ], "statVarSpec": { - "Count_CriminalActivities_AggravatedAssault": { - "name": "Aggravated Assault Cases", - "statVar": "Count_CriminalActivities_AggravatedAssault" - }, "Count_CriminalActivities_AggravatedAssault_multiple_place_bar_block": { "name": "Aggravated Assault Cases", "statVar": "Count_CriminalActivities_AggravatedAssault" }, - "Count_CriminalActivities_Burglary": { - "name": "Burglaries", - "statVar": "Count_CriminalActivities_Burglary" - }, "Count_CriminalActivities_Burglary_multiple_place_bar_block": { "name": "Burglaries", "statVar": "Count_CriminalActivities_Burglary" @@ -404,26 +108,14 @@ "name": "Criminal Activities", "statVar": "Count_CriminalActivities_CombinedCrime" }, - "Count_CriminalActivities_ForcibleRape": { - "name": "Forcible Rapes", - "statVar": "Count_CriminalActivities_ForcibleRape" - }, "Count_CriminalActivities_ForcibleRape_multiple_place_bar_block": { "name": "Forcible Rapes", "statVar": "Count_CriminalActivities_ForcibleRape" }, - "Count_CriminalActivities_LarcenyTheft": { - "name": "Larceny Theft Cases", - "statVar": "Count_CriminalActivities_LarcenyTheft" - }, "Count_CriminalActivities_LarcenyTheft_multiple_place_bar_block": { "name": "Larceny Theft Cases", "statVar": "Count_CriminalActivities_LarcenyTheft" }, - "Count_CriminalActivities_MotorVehicleTheft": { - "name": "Motor Vehicle Thefts", - "statVar": "Count_CriminalActivities_MotorVehicleTheft" - }, "Count_CriminalActivities_MotorVehicleTheft_multiple_place_bar_block": { "name": "Motor Vehicle Thefts", "statVar": "Count_CriminalActivities_MotorVehicleTheft" @@ -432,26 +124,14 @@ "name": "Murder and Non Negligent Manslaughter Cases Per Capita", "statVar": "Count_CriminalActivities_MurderAndNonNegligentManslaughter_AsFractionOf_Count_Person" }, - "Count_CriminalActivities_PropertyCrime": { - "name": "Property Related Crimes", - "statVar": "Count_CriminalActivities_PropertyCrime" - }, "Count_CriminalActivities_PropertyCrime_multiple_place_bar_block": { "name": "Property Related Crimes", "statVar": "Count_CriminalActivities_PropertyCrime" }, - "Count_CriminalActivities_Robbery": { - "name": "Robberies", - "statVar": "Count_CriminalActivities_Robbery" - }, "Count_CriminalActivities_Robbery_multiple_place_bar_block": { "name": "Robberies", "statVar": "Count_CriminalActivities_Robbery" }, - "Count_CriminalActivities_ViolentCrime": { - "name": "Violent Crimes", - "statVar": "Count_CriminalActivities_ViolentCrime" - }, "Count_CriminalActivities_ViolentCrime_multiple_place_bar_block": { "name": "Violent Crimes", "statVar": "Count_CriminalActivities_ViolentCrime" @@ -460,9 +140,6 @@ } ], "metadata": { - "containedPlaceTypes": { - "Country": "State" - }, "placeDcid": [ "country/USA" ] @@ -487,360 +164,7 @@ } ], "relatedThings": { - "childPlaces": { - "State": [ - { - "dcid": "geoId/01", - "name": "Alabama", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/02", - "name": "Alaska", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/04", - "name": "Arizona", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/05", - "name": "Arkansas", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/06", - "name": "California", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/08", - "name": "Colorado", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/09", - "name": "Connecticut", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/10", - "name": "Delaware", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/11", - "name": "District of Columbia", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/12", - "name": "Florida", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/13", - "name": "Georgia", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/15", - "name": "Hawaii", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/16", - "name": "Idaho", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/17", - "name": "Illinois", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/18", - "name": "Indiana", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/19", - "name": "Iowa", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/20", - "name": "Kansas", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/21", - "name": "Kentucky", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/22", - "name": "Louisiana", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/23", - "name": "Maine", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/24", - "name": "Maryland", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/25", - "name": "Massachusetts", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/26", - "name": "Michigan", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/27", - "name": "Minnesota", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/28", - "name": "Mississippi", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/29", - "name": "Missouri", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/30", - "name": "Montana", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/31", - "name": "Nebraska", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/32", - "name": "Nevada", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/33", - "name": "New Hampshire", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/34", - "name": "New Jersey", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/35", - "name": "New Mexico", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/36", - "name": "New York", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/37", - "name": "North Carolina", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/38", - "name": "North Dakota", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/39", - "name": "Ohio", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/40", - "name": "Oklahoma", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/41", - "name": "Oregon", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/42", - "name": "Pennsylvania", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/44", - "name": "Rhode Island", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/45", - "name": "South Carolina", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/46", - "name": "South Dakota", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/47", - "name": "Tennessee", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/48", - "name": "Texas", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/49", - "name": "Utah", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/50", - "name": "Vermont", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/51", - "name": "Virginia", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/53", - "name": "Washington", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/54", - "name": "West Virginia", - "types": [ - "State" - ] - }, - { - "dcid": "geoId/55", - "name": "Wisconsin", - "types": [ - "State" - ] - } - ] - }, + "childPlaces": {}, "childTopics": [], "exploreMore": { "Count_CriminalActivities_CombinedCrime": { diff --git a/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json b/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json index c4781bfc08..39e238486c 100644 --- a/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json +++ b/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json @@ -508,6 +508,67 @@ "denom": "Count_Person", "title": "Population: 16-64 Years, Female, Full Time Year Round Worker in States of United States of America" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Civilian_Female_NonInstitutionalized" + ], + "title": "Women Non Institutionalized in United States of America", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Women Non Institutionalized in United States of America", + "statVarKey": [ + "Count_Person_Civilian_Female_NonInstitutionalized" + ], + "title": "Women Non Institutionalized in United States of America", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Women Non Institutionalized" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Civilian_Female_NonInstitutionalized" + ], + "title": "Women Non Institutionalized in States of United States of America (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Civilian_Female_NonInstitutionalized" + ], + "title": "Women Non Institutionalized in States of United States of America (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Women Non Institutionalized in States of United States of America" + }, { "columns": [ { @@ -799,67 +860,6 @@ ], "denom": "Count_Person", "title": "Women With Disabilities in States of United States of America" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female" - ], - "title": "Bachelors, Women in United States of America", - "type": "LINE" - } - ] - }, - { - "tiles": [ - { - "description": "Bachelors, Women in United States of America", - "statVarKey": [ - "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female" - ], - "title": "Bachelors, Women in United States of America", - "type": "HIGHLIGHT" - } - ] - } - ], - "denom": "Count_Person", - "title": "Bachelors, Women" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female" - ], - "title": "Bachelors, Women in States of United States of America (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female" - ], - "title": "Bachelors, Women in States of United States of America (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Bachelors, Women in States of United States of America" } ], "statVarSpec": { @@ -875,14 +875,14 @@ "name": "Population: Bachelors Degree or Higher, Female", "statVar": "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female" }, - "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female": { - "name": "Bachelors, Women", - "statVar": "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female" - }, "Count_Person_3OrMoreYears_Female_EnrolledInSchool": { "name": "Population: Female, Enrolled in School", "statVar": "Count_Person_3OrMoreYears_Female_EnrolledInSchool" }, + "Count_Person_Civilian_Female_NonInstitutionalized": { + "name": "Women Non Institutionalized", + "statVar": "Count_Person_Civilian_Female_NonInstitutionalized" + }, "Count_Person_Female": { "name": "Women", "statVar": "Count_Person_Female" @@ -1384,13 +1384,20 @@ "Count_Person_45To64Years_EducationalAttainmentBachelorsDegreeOrHigher_Female" ] }, - "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female": { + "Count_Person_Civilian_Female_NonInstitutionalized": { "age": [ - "Count_Person_18To24Years_EducationalAttainmentBachelorsDegree_Female", - "Count_Person_25To34Years_EducationalAttainmentBachelorsDegree_Female", - "Count_Person_35To44Years_EducationalAttainmentBachelorsDegree_Female", - "Count_Person_45To64Years_EducationalAttainmentBachelorsDegree_Female", - "Count_Person_65OrMoreYears_EducationalAttainmentBachelorsDegree_Female" + "dc/09z87msgrnz46", + "dc/3ynz47ezvb9t3", + "dc/9zrfybzebz9eg", + "dc/clt08ev67qbg4", + "dc/e4tnwblpn05ng", + "dc/eyq93l7lzkljh", + "dc/fdt2p0r5fced1", + "dc/g8tzm4h7qzqnd", + "dc/spwgfh6tfr03c", + "dc/vqxc814k47fc5", + "dc/x8zvw66c41lx", + "dc/z3blp4w0t2nv2" ] }, "Count_Person_Female": { @@ -1403,11 +1410,6 @@ "Count_Person_67To69Years_Female", "Count_Person_Upto14Years_Female" ], - "educationalAttainment": [ - "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female", - "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female", - "Count_Person_EducationalAttainmentBachelorsDegree_Female" - ], "race": [ "Count_Person_Female_AsianAlone", "Count_Person_Female_TwoOrMoreRaces", diff --git a/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json b/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json index 28fb984756..c2f14e41e0 100644 --- a/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json +++ b/server/integration_tests/test_data/explore_strict_default_place/numberofheadlessdriversincalifornia/chart_config.json @@ -33,38 +33,6 @@ "denom": "Count_Person", "title": "Drive Alone" }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "dc/0gettc3bc60cb" - ], - "title": "Drive Alone in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "dc/0gettc3bc60cb" - ], - "title": "Drive Alone in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Drive Alone in Counties of California" - }, { "columns": [ { @@ -94,39 +62,6 @@ "denom": "Count_Person", "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", "title": "Count of Crash Incidents With Head on Collision" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" - ], - "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_VehicleCrashIncident_CollisionCrash_HeadOnCollision" - ], - "title": "Count of Crash Incidents With Head on Collision in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "description": "Count of crash incidents with head on collision of two motor vehicles in-transport when they are involved in the first harmful event of a collision crash.", - "title": "Count of Crash Incidents With Head on Collision in Counties of California" } ], "statVarSpec": { @@ -142,9 +77,6 @@ } ], "metadata": { - "containedPlaceTypes": { - "State": "County" - }, "placeDcid": [ "geoId/06" ] diff --git a/server/integration_tests/test_data/explore_strict_multi_var/chart_config.json b/server/integration_tests/test_data/explore_strict_multi_var/chart_config.json index 42bd0184f4..9e02c60536 100644 --- a/server/integration_tests/test_data/explore_strict_multi_var/chart_config.json +++ b/server/integration_tests/test_data/explore_strict_multi_var/chart_config.json @@ -9,82 +9,17 @@ { "tiles": [ { - "scatterTileSpec": { - "highlightTopRight": true - }, - "statVarKey": [ - "Percent_Person_Obesity_scatter", - "Percent_Person_SleepLessThan7Hours_scatter" - ], - "title": "Prevalence of Obesity (${yDate}) Vs. Percentage That Sleeps Less Than 7 Hours Per Night (${xDate}) in Counties of United States", - "type": "SCATTER" - } - ] - } - ], - "title": "Prevalence of Obesity vs. Percentage That Sleeps Less Than 7 Hours Per Night" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Percent_Person_Obesity" - ], - "title": "Prevalence of Obesity in Counties of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Percent_Person_Obesity" - ], - "title": "Prevalence of Obesity in Counties of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Prevalence of Obesity in Counties of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Percent_Person_SleepLessThan7Hours" - ], - "title": "Percentage That Sleeps Less Than 7 Hours Per Night in Counties of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, "statVarKey": [ + "Percent_Person_Obesity", "Percent_Person_SleepLessThan7Hours" ], - "title": "Percentage That Sleeps Less Than 7 Hours Per Night in Counties of United States (${date})", - "type": "RANKING" + "title": "Prevalence of Obesity and Percentage That Sleeps Less Than 7 Hours Per Night in United States", + "type": "LINE" } ] } ], - "title": "Percentage That Sleeps Less Than 7 Hours Per Night in Counties of United States" + "title": "Prevalence of Obesity and Percentage That Sleeps Less Than 7 Hours Per Night" }, { "columns": [ @@ -102,109 +37,6 @@ } ], "title": "% Obesity Among Adults, BMI >= 30 and Percentage That Sleeps Less Than 7 Hours Per Night" - }, - { - "columns": [ - { - "tiles": [ - { - "scatterTileSpec": { - "highlightTopRight": true - }, - "statVarKey": [ - "dc/4lvmzr1h1ylk1_scatter", - "Percent_Person_SleepLessThan7Hours_scatter" - ], - "title": "Prevalence: Female, Obesity (${yDate}) Vs. Percentage That Sleeps Less Than 7 Hours Per Night (${xDate}) in Counties of United States", - "type": "SCATTER" - } - ] - } - ], - "title": "Prevalence: Female, Obesity vs. Percentage That Sleeps Less Than 7 Hours Per Night" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "dc/4lvmzr1h1ylk1" - ], - "title": "Prevalence: Female, Obesity in Counties of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "dc/4lvmzr1h1ylk1" - ], - "title": "Prevalence: Female, Obesity in Counties of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Prevalence: Female, Obesity in Counties of United States" - }, - { - "columns": [ - { - "tiles": [ - { - "scatterTileSpec": { - "highlightTopRight": true - }, - "statVarKey": [ - "dc/x13tvt8jsgrm4_scatter", - "Percent_Person_SleepLessThan7Hours_scatter" - ], - "title": "Prevalence: Male, Obesity (${yDate}) Vs. Percentage That Sleeps Less Than 7 Hours Per Night (${xDate}) in Counties of United States", - "type": "SCATTER" - } - ] - } - ], - "denom": "Count_Person", - "title": "Prevalence: Male, Obesity vs. Percentage That Sleeps Less Than 7 Hours Per Night" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "dc/x13tvt8jsgrm4" - ], - "title": "Prevalence: Male, Obesity in Counties of United States (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "dc/x13tvt8jsgrm4" - ], - "title": "Prevalence: Male, Obesity in Counties of United States (${date})", - "type": "RANKING" - } - ] - } - ], - "title": "Prevalence: Male, Obesity in Counties of United States" } ], "statVarSpec": { @@ -213,51 +45,19 @@ "statVar": "Percent_Person_Obesity", "unit": "%" }, - "Percent_Person_Obesity_scatter": { - "name": "Prevalence of Obesity", - "noPerCapita": true, - "statVar": "Percent_Person_Obesity", - "unit": "%" - }, "Percent_Person_SleepLessThan7Hours": { "name": "Percentage That Sleeps Less Than 7 Hours Per Night", "statVar": "Percent_Person_SleepLessThan7Hours", "unit": "%" }, - "Percent_Person_SleepLessThan7Hours_scatter": { - "name": "Percentage That Sleeps Less Than 7 Hours Per Night", - "noPerCapita": true, - "statVar": "Percent_Person_SleepLessThan7Hours", - "unit": "%" - }, "WHO/NCD_BMI_30A": { "name": "% Obesity Among Adults, BMI >= 30", "statVar": "WHO/NCD_BMI_30A" - }, - "dc/4lvmzr1h1ylk1": { - "name": "Prevalence: Female, Obesity", - "statVar": "dc/4lvmzr1h1ylk1" - }, - "dc/4lvmzr1h1ylk1_scatter": { - "name": "Prevalence: Female, Obesity", - "noPerCapita": true, - "statVar": "dc/4lvmzr1h1ylk1" - }, - "dc/x13tvt8jsgrm4": { - "name": "Prevalence: Male, Obesity", - "statVar": "dc/x13tvt8jsgrm4" - }, - "dc/x13tvt8jsgrm4_scatter": { - "name": "Prevalence: Male, Obesity", - "statVar": "dc/x13tvt8jsgrm4" } } } ], "metadata": { - "containedPlaceTypes": { - "Country": "County" - }, "placeDcid": [ "country/USA" ]