From d936b66a16c1e40d189701c7749835485681212d Mon Sep 17 00:00:00 2001 From: Hannah Pho Date: Mon, 25 Nov 2024 17:59:36 -0500 Subject: [PATCH] Update integration test goldens (#4759) --- .../emissionsinhouston/chart_config.json | 663 ++++++++++-------- .../tellmeaboutheartdisease/chart_config.json | 2 +- .../chart_config.json | 2 +- 3 files changed, 366 insertions(+), 301 deletions(-) diff --git a/server/integration_tests/test_data/e2e_edge_cases/emissionsinhouston/chart_config.json b/server/integration_tests/test_data/e2e_edge_cases/emissionsinhouston/chart_config.json index 156c685ed3..753915ad0a 100644 --- a/server/integration_tests/test_data/e2e_edge_cases/emissionsinhouston/chart_config.json +++ b/server/integration_tests/test_data/e2e_edge_cases/emissionsinhouston/chart_config.json @@ -10,9 +10,9 @@ "tiles": [ { "statVarKey": [ - "Annual_Emissions_GreenhouseGas" + "Annual_Emissions_GreenhouseGas_NonBiogenic" ], - "title": "Greenhouse Gas Emissions in United States", + "title": "Annual Emissions of Non Biogenic Greenhouse Gases in Fort Bend County", "type": "LINE" } ] @@ -20,55 +20,47 @@ { "tiles": [ { - "description": "Greenhouse Gas Emissions in United States", + "description": "Annual Emissions of Non Biogenic Greenhouse Gases in Fort Bend County", "statVarKey": [ - "Annual_Emissions_GreenhouseGas" + "Annual_Emissions_GreenhouseGas_NonBiogenic" ], - "title": "Greenhouse Gas Emissions in United States", + "title": "Annual Emissions of Non Biogenic Greenhouse Gases in Fort Bend County", "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "description": "Annual emissions from all greenhouse gases measured in tonnes of CO\u2082 equivalents.", - "title": "Greenhouse Gas Emissions" + "title": "Annual Emissions of Non Biogenic Greenhouse Gases" }, { "columns": [ { "tiles": [ { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "country/USA" + "statVarKey": [ + "Annual_Emissions_CarbonDioxide_NonBiogenic" ], + "title": "Annual Emissions of Non Biogenic Carbon Dioxide in Fort Bend County", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Annual Emissions of Non Biogenic Carbon Dioxide in Fort Bend County", "statVarKey": [ - "Annual_Emissions_GreenhouseGas_Agriculture_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_ElectricityGeneration_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_FuelCombustionInBuildings_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_ForestryAndLandUse_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_Manufacturing_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_MineralExtraction_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_OilAndGas_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_Transportation_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_WasteManagement_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_CementProduction_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_SteelManufacturing_multiple_place_bar_block", - "Annual_Emissions_GreenhouseGas_ForestFire_multiple_place_bar_block" + "Annual_Emissions_CarbonDioxide_NonBiogenic" ], - "title": "Greenhouse Gas Emissions by Source in United States (${date})", - "type": "BAR" + "title": "Annual Emissions of Non Biogenic Carbon Dioxide in Fort Bend County", + "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Greenhouse Gas Emissions by Source" + "title": "Annual Emissions of Non Biogenic Carbon Dioxide" }, { "columns": [ @@ -76,9 +68,29 @@ "tiles": [ { "statVarKey": [ - "eia/INTL.4008-8-MMTCD.A" + "Annual_Emissions_Hydrofluorocarbon_NonBiogenic", + "Annual_Emissions_NitrogenTrifluoride_NonBiogenic", + "Annual_Emissions_Perfluorocarbon_NonBiogenic", + "Annual_Emissions_SulfurHexafluoride_NonBiogenic" ], - "title": "CO2 Emissions, Annual in United States", + "title": "Flourinated Gas Emissions by Type in Fort Bend County", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Flourinated Gas Emissions by Type" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Annual_Emissions_Methane_NonBiogenic" + ], + "title": "Annual Emissions of Non Biogenic Methane in Fort Bend County", "type": "LINE" } ] @@ -86,18 +98,18 @@ { "tiles": [ { - "description": "CO2 Emissions, Annual in United States", + "description": "Annual Emissions of Non Biogenic Methane in Fort Bend County", "statVarKey": [ - "eia/INTL.4008-8-MMTCD.A" + "Annual_Emissions_Methane_NonBiogenic" ], - "title": "CO2 Emissions, Annual in United States", + "title": "Annual Emissions of Non Biogenic Methane in Fort Bend County", "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "CO2 Emissions, Annual" + "title": "Methane Emissions by Source" }, { "columns": [ @@ -105,9 +117,9 @@ "tiles": [ { "statVarKey": [ - "Amount_Emissions_CarbonDioxide_PerCapita" + "Annual_Emissions_NitrousOxide_NonBiogenic" ], - "title": "CO2 Emissions Per Capita in United States", + "title": "Annual Emissions of Non Biogenic Nitrous Oxide in Fort Bend County", "type": "LINE" } ] @@ -115,17 +127,52 @@ { "tiles": [ { - "description": "CO2 Emissions Per Capita in United States", + "description": "Annual Emissions of Non Biogenic Nitrous Oxide in Fort Bend County", "statVarKey": [ - "Amount_Emissions_CarbonDioxide_PerCapita" + "Annual_Emissions_NitrousOxide_NonBiogenic" ], - "title": "CO2 Emissions Per Capita in United States", + "title": "Annual Emissions of Non Biogenic Nitrous Oxide in Fort Bend County", "type": "HIGHLIGHT" } ] } ], - "title": "CO2 Emissions Per Capita" + "denom": "Count_Person", + "title": "Nitrous Oxide Emissions by Source" + }, + { + "columns": [ + { + "tiles": [ + { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "geoId/48157" + ], + "statVarKey": [ + "Annual_Amount_Emissions_PM2.5_SCC_1_ExternalCombustion_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_2_InternalCombustionEngines_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_3_IndustrialProcesses_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_4_PetroleumAndSolventEvaporation_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_5_WasteDisposal_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_21_StationarySourceFuelCombustion_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_22_MobileSources_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_23_IndustrialProcesses_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_26_WasteDisposalTreatmentAndRecovery_multiple_place_bar_block", + "Annual_Amount_Emissions_PM2.5_SCC_28_MiscellaneousAreaSources_multiple_place_bar_block" + ], + "title": "PM 2.5 Emissions by Source in Fort Bend County (${date})", + "type": "BAR" + } + ] + } + ], + "denom": "Count_Person", + "title": "PM 2.5 Emissions by Source" }, { "columns": [ @@ -138,26 +185,29 @@ "sort": "DESCENDING" }, "comparisonPlaces": [ - "country/USA" + "geoId/48157" ], "statVarKey": [ - "Annual_Emissions_CarbonDioxide_Agriculture_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_FossilFuelOperations_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_Manufacturing_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_MineralExtraction_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_Power_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_Transportation_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_WasteManagement_multiple_place_bar_block" + "Annual_Amount_Emissions_SulfurDioxide_SCC_1_ExternalCombustion_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_2_InternalCombustionEngines_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_3_IndustrialProcesses_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_4_PetroleumAndSolventEvaporation_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_5_WasteDisposal_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_21_StationarySourceFuelCombustion_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_22_MobileSources_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_23_IndustrialProcesses_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_26_WasteDisposalTreatmentAndRecovery_multiple_place_bar_block", + "Annual_Amount_Emissions_SulfurDioxide_SCC_28_MiscellaneousAreaSources_multiple_place_bar_block", + "Annual_Emissions_SulfurHexafluoride_NonBiogenic_multiple_place_bar_block" ], - "title": "CO2 Emissions by Source in United States (${date})", + "title": "Sulfur Dioxide Emissions by Source in Fort Bend County (${date})", "type": "BAR" } ] } ], "denom": "Count_Person", - "title": "CO2 Emissions by Source" + "title": "Sulfur Dioxide Emissions by Source" }, { "columns": [ @@ -165,49 +215,57 @@ "tiles": [ { "statVarKey": [ - "Annual_Emissions_Methane_Agriculture", - "Annual_Emissions_Methane_FossilFuelOperations", - "Annual_Emissions_Methane_OpenBurningWaste", - "Annual_Emissions_Methane_WasteManagement" + "Annual_Amount_Emissions_SCC_27_NaturalSources" ], - "title": "Methane Emissions by Source in United States", + "title": "Annual Emissions: Natural Sources in Fort Bend County", "type": "LINE" } ] + }, + { + "tiles": [ + { + "description": "Annual Emissions: Natural Sources in Fort Bend County", + "statVarKey": [ + "Annual_Amount_Emissions_SCC_27_NaturalSources" + ], + "title": "Annual Emissions: Natural Sources in Fort Bend County", + "type": "HIGHLIGHT" + } + ] } ], "denom": "Count_Person", - "title": "Methane Emissions by Source" + "title": "Annual Emissions: Natural Sources" }, { "columns": [ { "tiles": [ { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "country/USA" + "statVarKey": [ + "Annual_Amount_Emissions_SCC_28_MiscellaneousAreaSources" ], + "title": "Annual Emissions: Misc in Fort Bend County", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Annual Emissions: Misc in Fort Bend County", "statVarKey": [ - "Annual_Emissions_NitrousOxide_Agriculture_multiple_place_bar_block", - "Annual_Emissions_NitrousOxide_FuelCombustionForResidentialCommercialOnsiteHeating_multiple_place_bar_block", - "Annual_Emissions_NitrousOxide_Manufacturing_multiple_place_bar_block", - "Annual_Emissions_NitrousOxide_Transportation_multiple_place_bar_block", - "Annual_Emissions_NitrousOxide_WasteManagement_multiple_place_bar_block", - "Annual_Emissions_NitrousOxide_WastewaterTreatmentAndDischarge_multiple_place_bar_block" + "Annual_Amount_Emissions_SCC_28_MiscellaneousAreaSources" ], - "title": "Nitrous Oxide Emissions by Source in United States (${date})", - "type": "BAR" + "title": "Annual Emissions: Misc in Fort Bend County", + "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Nitrous Oxide Emissions by Source" + "title": "Annual Emissions: Misc" }, { "columns": [ @@ -215,9 +273,9 @@ "tiles": [ { "statVarKey": [ - "Annual_Emissions_GreenhouseGas_FuelCombustionForRoadVehicles" + "Annual_Amount_Emissions_SCC_1_ExternalCombustion" ], - "title": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Greenhouse Gas in United States", + "title": "Annual Emissions: External Combustion in Fort Bend County", "type": "LINE" } ] @@ -225,313 +283,320 @@ { "tiles": [ { - "description": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Greenhouse Gas in United States", + "description": "Annual Emissions: External Combustion in Fort Bend County", "statVarKey": [ - "Annual_Emissions_GreenhouseGas_FuelCombustionForRoadVehicles" + "Annual_Amount_Emissions_SCC_1_ExternalCombustion" ], - "title": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Greenhouse Gas in United States", + "title": "Annual Emissions: External Combustion in Fort Bend County", "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Greenhouse Gas" + "title": "Annual Emissions: External Combustion" }, { "columns": [ { "tiles": [ { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "country/USA" + "statVarKey": [ + "Annual_Amount_Emissions_SCC_2_InternalCombustionEngines" ], + "title": "Annual Emissions: Internal Combustion Engines in Fort Bend County", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Annual Emissions: Internal Combustion Engines in Fort Bend County", "statVarKey": [ - "Annual_Emissions_GreenhouseGas_multiple_place_bar_block", - "Annual_Amount_Emissions_CarbonDioxide_multiple_place_bar_block", - "Annual_Amount_Emissions_CarbonMonoxide_multiple_place_bar_block", - "Annual_Amount_Emissions_OxidesOfNitrogen_multiple_place_bar_block", - "Annual_Amount_Emissions_OxidesOfSulfur_multiple_place_bar_block", - "Annual_Amount_Emissions_VolatileOrganicCompound_multiple_place_bar_block" + "Annual_Amount_Emissions_SCC_2_InternalCombustionEngines" ], - "title": "Greenhouse Gas Emissions and More in United States (${date})", - "type": "BAR" + "title": "Annual Emissions: Internal Combustion Engines in Fort Bend County", + "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Related: Greenhouse Gas Emissions and More" + "title": "Annual Emissions: Internal Combustion Engines" }, { "columns": [ { "tiles": [ { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "country/USA" + "statVarKey": [ + "Annual_Amount_Emissions_SCC_25_StorageAndTransport" ], + "title": "Annual Emissions: Storage and Transport in Fort Bend County", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Annual Emissions: Storage and Transport in Fort Bend County", "statVarKey": [ - "Annual_Emissions_GreenhouseGas_Transportation_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxideEquivalent100YearGlobalWarmingPotential_Transportation_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxideEquivalent20YearGlobalWarmingPotential_Transportation_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_Transportation_multiple_place_bar_block", - "Annual_Emissions_Methane_Transportation_multiple_place_bar_block", - "Annual_Emissions_NitrousOxide_Transportation_multiple_place_bar_block" + "Annual_Amount_Emissions_SCC_25_StorageAndTransport" ], - "title": "Greenhouse Gas Emissions From Transportation and More in United States (${date})", - "type": "BAR" + "title": "Annual Emissions: Storage and Transport in Fort Bend County", + "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Related: Greenhouse Gas Emissions From Transportation and More" + "title": "Annual Emissions: Storage and Transport" }, { "columns": [ { "tiles": [ { - "barTileSpec": { - "maxPlaces": 15, - "maxVariables": 15, - "sort": "DESCENDING" - }, - "comparisonPlaces": [ - "country/USA" + "statVarKey": [ + "Annual_Amount_Emissions_SCC_23_IndustrialProcesses" ], + "title": "Annual Emissions: Industrial Processes in Fort Bend County", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Annual Emissions: Industrial Processes in Fort Bend County", "statVarKey": [ - "Annual_Emissions_GreenhouseGas_FuelCombustionForRoadVehicles_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxideEquivalent100YearGlobalWarmingPotential_FuelCombustionForRoadVehicles_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxideEquivalent20YearGlobalWarmingPotential_FuelCombustionForRoadVehicles_multiple_place_bar_block", - "Annual_Emissions_CarbonDioxide_FuelCombustionForRoadVehicles_multiple_place_bar_block", - "Annual_Emissions_Methane_FuelCombustionForRoadVehicles_multiple_place_bar_block", - "Annual_Emissions_NitrousOxide_FuelCombustionForRoadVehicles_multiple_place_bar_block" + "Annual_Amount_Emissions_SCC_23_IndustrialProcesses" ], - "title": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Greenhouse Gas and More in United States (${date})", - "type": "BAR" + "title": "Annual Emissions: Industrial Processes in Fort Bend County", + "type": "HIGHLIGHT" } ] } ], "denom": "Count_Person", - "title": "Related: Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Greenhouse Gas and More" + "title": "Annual Emissions: Industrial Processes" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Annual_Amount_Emissions_SCC_3_IndustrialProcesses" + ], + "title": "Annual Emissions: Industrial Processes in Fort Bend County", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Annual Emissions: Industrial Processes in Fort Bend County", + "statVarKey": [ + "Annual_Amount_Emissions_SCC_3_IndustrialProcesses" + ], + "title": "Annual Emissions: Industrial Processes in Fort Bend County", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Emissions: Industrial Processes" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Annual_Amount_Emissions_SCC_21_StationarySourceFuelCombustion" + ], + "title": "Annual Emissions: Stationary Source Fuel Combustion in Fort Bend County", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Annual Emissions: Stationary Source Fuel Combustion in Fort Bend County", + "statVarKey": [ + "Annual_Amount_Emissions_SCC_21_StationarySourceFuelCombustion" + ], + "title": "Annual Emissions: Stationary Source Fuel Combustion in Fort Bend County", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Annual Emissions: Stationary Source Fuel Combustion" } ], "statVarSpec": { - "Amount_Emissions_CarbonDioxide_PerCapita": { - "name": "CO2 Emissions Per Capita", - "statVar": "Amount_Emissions_CarbonDioxide_PerCapita" - }, - "Annual_Amount_Emissions_CarbonDioxide_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Carbon Dioxide", - "statVar": "Annual_Amount_Emissions_CarbonDioxide" - }, - "Annual_Amount_Emissions_CarbonMonoxide_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Carbon Monoxide", - "statVar": "Annual_Amount_Emissions_CarbonMonoxide" - }, - "Annual_Amount_Emissions_OxidesOfNitrogen_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Oxides of Nitrogen", - "statVar": "Annual_Amount_Emissions_OxidesOfNitrogen" - }, - "Annual_Amount_Emissions_OxidesOfSulfur_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Oxides of Sulfur", - "statVar": "Annual_Amount_Emissions_OxidesOfSulfur" - }, - "Annual_Amount_Emissions_VolatileOrganicCompound_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Volatile Organic Compound", - "statVar": "Annual_Amount_Emissions_VolatileOrganicCompound" - }, - "Annual_Emissions_CarbonDioxideEquivalent100YearGlobalWarmingPotential_FuelCombustionForRoadVehicles_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Carbon Dioxide Equivalent 100 Year Global Warming Potential", - "statVar": "Annual_Emissions_CarbonDioxideEquivalent100YearGlobalWarmingPotential_FuelCombustionForRoadVehicles" - }, - "Annual_Emissions_CarbonDioxideEquivalent100YearGlobalWarmingPotential_Transportation_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Transportation, Carbon Dioxide Equivalent 100 Year Global Warming Potential", - "statVar": "Annual_Emissions_CarbonDioxideEquivalent100YearGlobalWarmingPotential_Transportation" - }, - "Annual_Emissions_CarbonDioxideEquivalent20YearGlobalWarmingPotential_FuelCombustionForRoadVehicles_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Carbon Dioxide Equivalent 20 Year Global Warming Potential", - "statVar": "Annual_Emissions_CarbonDioxideEquivalent20YearGlobalWarmingPotential_FuelCombustionForRoadVehicles" - }, - "Annual_Emissions_CarbonDioxideEquivalent20YearGlobalWarmingPotential_Transportation_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Transportation, Carbon Dioxide Equivalent 20 Year Global Warming Potential", - "statVar": "Annual_Emissions_CarbonDioxideEquivalent20YearGlobalWarmingPotential_Transportation" - }, - "Annual_Emissions_CarbonDioxide_Agriculture_multiple_place_bar_block": { - "name": "CO\u2082 Emissions from Agriculture", - "statVar": "Annual_Emissions_CarbonDioxide_Agriculture" - }, - "Annual_Emissions_CarbonDioxide_FossilFuelOperations_multiple_place_bar_block": { - "name": "CO\u2082 Emissions from Fossil Fuel Operations", - "statVar": "Annual_Emissions_CarbonDioxide_FossilFuelOperations" - }, - "Annual_Emissions_CarbonDioxide_FuelCombustionForRoadVehicles_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Carbon Dioxide", - "statVar": "Annual_Emissions_CarbonDioxide_FuelCombustionForRoadVehicles" + "Annual_Amount_Emissions_PM2.5_SCC_1_ExternalCombustion_multiple_place_bar_block": { + "name": "Annual Amount Emissions PM2.5, ExternalCombustion (1)", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_1_ExternalCombustion" }, - "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings_multiple_place_bar_block": { - "name": "CO\u2082 Emissions from Fuel Combustion in Buildings", - "statVar": "Annual_Emissions_CarbonDioxide_FuelCombustionInBuildings" + "Annual_Amount_Emissions_PM2.5_SCC_21_StationarySourceFuelCombustion_multiple_place_bar_block": { + "name": "Annual Amount Emissions PM2.5, StationarySourceFuelCombustion (21)", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_21_StationarySourceFuelCombustion" }, - "Annual_Emissions_CarbonDioxide_Manufacturing_multiple_place_bar_block": { - "name": "CO\u2082 Emissions from Manufacturing", - "statVar": "Annual_Emissions_CarbonDioxide_Manufacturing" + "Annual_Amount_Emissions_PM2.5_SCC_22_MobileSources_multiple_place_bar_block": { + "name": "Annual Amount Emissions PM2.5, MobileSources (22)", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_22_MobileSources" }, - "Annual_Emissions_CarbonDioxide_MineralExtraction_multiple_place_bar_block": { - "name": "CO\u2082 Emissions from Mineral Extraction", - "statVar": "Annual_Emissions_CarbonDioxide_MineralExtraction" + "Annual_Amount_Emissions_PM2.5_SCC_23_IndustrialProcesses_multiple_place_bar_block": { + "name": "Annual Amount Emissions PM2.5, IndustrialProcesses (23)", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_23_IndustrialProcesses" }, - "Annual_Emissions_CarbonDioxide_Power_multiple_place_bar_block": { - "name": "CO\u2082 Emissions from Power Sector", - "statVar": "Annual_Emissions_CarbonDioxide_Power" + "Annual_Amount_Emissions_PM2.5_SCC_26_WasteDisposalTreatmentAndRecovery_multiple_place_bar_block": { + "name": "Annual Amount Emissions PM2.5, WasteDisposalTreatmentAndRecovery (26)", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_26_WasteDisposalTreatmentAndRecovery" }, - "Annual_Emissions_CarbonDioxide_Transportation_multiple_place_bar_block": { - "name": "CO\u2082 Emissions from Transportation", - "statVar": "Annual_Emissions_CarbonDioxide_Transportation" + "Annual_Amount_Emissions_PM2.5_SCC_28_MiscellaneousAreaSources_multiple_place_bar_block": { + "name": "Annual Emissions: PM 2.5, Misc Sources", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_28_MiscellaneousAreaSources" }, - "Annual_Emissions_CarbonDioxide_WasteManagement_multiple_place_bar_block": { - "name": "CO\u2082 Emissions from Waste Management", - "statVar": "Annual_Emissions_CarbonDioxide_WasteManagement" + "Annual_Amount_Emissions_PM2.5_SCC_2_InternalCombustionEngines_multiple_place_bar_block": { + "name": "Annual Emissions: PM 2.5, Internal Combustion Engine", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_2_InternalCombustionEngines" }, - "Annual_Emissions_GreenhouseGas": { - "name": "Greenhouse Gas Emissions", - "statVar": "Annual_Emissions_GreenhouseGas" + "Annual_Amount_Emissions_PM2.5_SCC_3_IndustrialProcesses_multiple_place_bar_block": { + "name": "Annual Emissions: PM 2.5, Industrial Processes", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_3_IndustrialProcesses" }, - "Annual_Emissions_GreenhouseGas_Agriculture_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions from Agriculture", - "statVar": "Annual_Emissions_GreenhouseGas_Agriculture" + "Annual_Amount_Emissions_PM2.5_SCC_4_PetroleumAndSolventEvaporation_multiple_place_bar_block": { + "name": "Annual Emissions: PM 2.5, Petroleum & Solvent Evaporation", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_4_PetroleumAndSolventEvaporation" }, - "Annual_Emissions_GreenhouseGas_CementProduction_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Cement Production, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_CementProduction" + "Annual_Amount_Emissions_PM2.5_SCC_5_WasteDisposal_multiple_place_bar_block": { + "name": "Annual Emissions: PM 2.5, Waste Disposal", + "statVar": "Annual_Amount_Emissions_PM2.5_SCC_5_WasteDisposal" }, - "Annual_Emissions_GreenhouseGas_ElectricityGeneration_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions from Electricity Generation", - "statVar": "Annual_Emissions_GreenhouseGas_ElectricityGeneration" + "Annual_Amount_Emissions_SCC_1_ExternalCombustion": { + "name": "Annual Emissions: External Combustion", + "statVar": "Annual_Amount_Emissions_SCC_1_ExternalCombustion" }, - "Annual_Emissions_GreenhouseGas_ForestFire_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Forest Fire, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_ForestFire" + "Annual_Amount_Emissions_SCC_21_StationarySourceFuelCombustion": { + "name": "Annual Emissions: Stationary Source Fuel Combustion", + "statVar": "Annual_Amount_Emissions_SCC_21_StationarySourceFuelCombustion" }, - "Annual_Emissions_GreenhouseGas_ForestryAndLandUse_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions from Forestry and Land Use", - "statVar": "Annual_Emissions_GreenhouseGas_ForestryAndLandUse" + "Annual_Amount_Emissions_SCC_23_IndustrialProcesses": { + "name": "Annual Emissions: Industrial Processes", + "statVar": "Annual_Amount_Emissions_SCC_23_IndustrialProcesses" }, - "Annual_Emissions_GreenhouseGas_FuelCombustionForRoadVehicles": { - "name": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_FuelCombustionForRoadVehicles" + "Annual_Amount_Emissions_SCC_25_StorageAndTransport": { + "name": "Annual Emissions: Storage and Transport", + "statVar": "Annual_Amount_Emissions_SCC_25_StorageAndTransport" }, - "Annual_Emissions_GreenhouseGas_FuelCombustionForRoadVehicles_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_FuelCombustionForRoadVehicles" + "Annual_Amount_Emissions_SCC_27_NaturalSources": { + "name": "Annual Emissions: Natural Sources", + "statVar": "Annual_Amount_Emissions_SCC_27_NaturalSources" }, - "Annual_Emissions_GreenhouseGas_FuelCombustionInBuildings_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions from Fuel Combustion in Buildings", - "statVar": "Annual_Emissions_GreenhouseGas_FuelCombustionInBuildings" + "Annual_Amount_Emissions_SCC_28_MiscellaneousAreaSources": { + "name": "Annual Emissions: Misc", + "statVar": "Annual_Amount_Emissions_SCC_28_MiscellaneousAreaSources" }, - "Annual_Emissions_GreenhouseGas_Manufacturing_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions from Manufacturing", - "statVar": "Annual_Emissions_GreenhouseGas_Manufacturing" + "Annual_Amount_Emissions_SCC_2_InternalCombustionEngines": { + "name": "Annual Emissions: Internal Combustion Engines", + "statVar": "Annual_Amount_Emissions_SCC_2_InternalCombustionEngines" }, - "Annual_Emissions_GreenhouseGas_MineralExtraction_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions from Mineral Extraction", - "statVar": "Annual_Emissions_GreenhouseGas_MineralExtraction" + "Annual_Amount_Emissions_SCC_3_IndustrialProcesses": { + "name": "Annual Emissions: Industrial Processes", + "statVar": "Annual_Amount_Emissions_SCC_3_IndustrialProcesses" }, - "Annual_Emissions_GreenhouseGas_OilAndGas_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Oil And Gas, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_OilAndGas" + "Annual_Amount_Emissions_SulfurDioxide_SCC_1_ExternalCombustion_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, External Combustion", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_1_ExternalCombustion" }, - "Annual_Emissions_GreenhouseGas_SteelManufacturing_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Steel Manufacturing, Greenhouse Gas", - "statVar": "Annual_Emissions_GreenhouseGas_SteelManufacturing" + "Annual_Amount_Emissions_SulfurDioxide_SCC_21_StationarySourceFuelCombustion_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Stationary Source Fuel Combustion", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_21_StationarySourceFuelCombustion" }, - "Annual_Emissions_GreenhouseGas_Transportation_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions from Transportation", - "statVar": "Annual_Emissions_GreenhouseGas_Transportation" + "Annual_Amount_Emissions_SulfurDioxide_SCC_22_MobileSources_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Mobile Sources", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_22_MobileSources" }, - "Annual_Emissions_GreenhouseGas_WasteManagement_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions from Waste Management", - "statVar": "Annual_Emissions_GreenhouseGas_WasteManagement" + "Annual_Amount_Emissions_SulfurDioxide_SCC_23_IndustrialProcesses_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Industrial Processes", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_23_IndustrialProcesses" }, - "Annual_Emissions_GreenhouseGas_multiple_place_bar_block": { - "name": "Greenhouse Gas Emissions", - "statVar": "Annual_Emissions_GreenhouseGas" + "Annual_Amount_Emissions_SulfurDioxide_SCC_26_WasteDisposalTreatmentAndRecovery_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Waste Treatment & Recovery", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_26_WasteDisposalTreatmentAndRecovery" }, - "Annual_Emissions_Methane_Agriculture": { - "name": "Annual Amount of Emissions: Agriculture, Methane", - "statVar": "Annual_Emissions_Methane_Agriculture" + "Annual_Amount_Emissions_SulfurDioxide_SCC_28_MiscellaneousAreaSources_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Misc Sources", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_28_MiscellaneousAreaSources" }, - "Annual_Emissions_Methane_FossilFuelOperations": { - "name": "Annual Amount of Emissions: Fossil Fuel Operations, Methane", - "statVar": "Annual_Emissions_Methane_FossilFuelOperations" + "Annual_Amount_Emissions_SulfurDioxide_SCC_2_InternalCombustionEngines_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Internal Combustion Engine", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_2_InternalCombustionEngines" }, - "Annual_Emissions_Methane_FuelCombustionForRoadVehicles_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Methane", - "statVar": "Annual_Emissions_Methane_FuelCombustionForRoadVehicles" + "Annual_Amount_Emissions_SulfurDioxide_SCC_3_IndustrialProcesses_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Industrial Processes", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_3_IndustrialProcesses" }, - "Annual_Emissions_Methane_OpenBurningWaste": { - "name": "Annual Amount of Emissions: Open Burning Waste, Methane", - "statVar": "Annual_Emissions_Methane_OpenBurningWaste" + "Annual_Amount_Emissions_SulfurDioxide_SCC_4_PetroleumAndSolventEvaporation_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Petroleum & Solvent Evaporation", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_4_PetroleumAndSolventEvaporation" }, - "Annual_Emissions_Methane_Transportation_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Transportation, Methane", - "statVar": "Annual_Emissions_Methane_Transportation" + "Annual_Amount_Emissions_SulfurDioxide_SCC_5_WasteDisposal_multiple_place_bar_block": { + "name": "Annual Emissions: Sulfur Dioxide, Waste Disposal", + "statVar": "Annual_Amount_Emissions_SulfurDioxide_SCC_5_WasteDisposal" }, - "Annual_Emissions_Methane_WasteManagement": { - "name": "Annual Amount of Emissions: Waste Management, Methane", - "statVar": "Annual_Emissions_Methane_WasteManagement" + "Annual_Emissions_CarbonDioxide_NonBiogenic": { + "name": "Annual Emissions of Non Biogenic Carbon Dioxide", + "statVar": "Annual_Emissions_CarbonDioxide_NonBiogenic" }, - "Annual_Emissions_NitrousOxide_Agriculture_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Agriculture, Nitrous Oxide", - "statVar": "Annual_Emissions_NitrousOxide_Agriculture" + "Annual_Emissions_GreenhouseGas_NonBiogenic": { + "name": "Annual Emissions of Non Biogenic Greenhouse Gases", + "statVar": "Annual_Emissions_GreenhouseGas_NonBiogenic" }, - "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" + "Annual_Emissions_Hydrofluorocarbon_NonBiogenic": { + "name": "Annual Amount of Emissions: Non Biogenic Emission Source, Hydrofluorocarbon", + "statVar": "Annual_Emissions_Hydrofluorocarbon_NonBiogenic" }, - "Annual_Emissions_NitrousOxide_FuelCombustionForRoadVehicles_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Fuel Combustion for Road Vehicles, Nitrous Oxide", - "statVar": "Annual_Emissions_NitrousOxide_FuelCombustionForRoadVehicles" + "Annual_Emissions_Methane_NonBiogenic": { + "name": "Annual Emissions of Non Biogenic Methane", + "statVar": "Annual_Emissions_Methane_NonBiogenic" }, - "Annual_Emissions_NitrousOxide_Manufacturing_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Manufacturing, Nitrous Oxide", - "statVar": "Annual_Emissions_NitrousOxide_Manufacturing" + "Annual_Emissions_NitrogenTrifluoride_NonBiogenic": { + "name": "Annual Amount of Emissions: Non Biogenic Emission Source, Nitrogen Trifluoride", + "statVar": "Annual_Emissions_NitrogenTrifluoride_NonBiogenic" }, - "Annual_Emissions_NitrousOxide_Transportation_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Transportation, Nitrous Oxide", - "statVar": "Annual_Emissions_NitrousOxide_Transportation" + "Annual_Emissions_NitrousOxide_NonBiogenic": { + "name": "Annual Emissions of Non Biogenic Nitrous Oxide", + "statVar": "Annual_Emissions_NitrousOxide_NonBiogenic" }, - "Annual_Emissions_NitrousOxide_WasteManagement_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Waste Management, Nitrous Oxide", - "statVar": "Annual_Emissions_NitrousOxide_WasteManagement" + "Annual_Emissions_Perfluorocarbon_NonBiogenic": { + "name": "Annual Amount of Emissions: Non Biogenic Emission Source, Perfluorocarbon", + "statVar": "Annual_Emissions_Perfluorocarbon_NonBiogenic" }, - "Annual_Emissions_NitrousOxide_WastewaterTreatmentAndDischarge_multiple_place_bar_block": { - "name": "Annual Amount of Emissions: Wastewater Treatment And Discharge, Nitrous Oxide", - "statVar": "Annual_Emissions_NitrousOxide_WastewaterTreatmentAndDischarge" + "Annual_Emissions_SulfurHexafluoride_NonBiogenic": { + "name": "Annual Amount of Emissions: Non Biogenic Emission Source, Sulfur Hexafluoride", + "statVar": "Annual_Emissions_SulfurHexafluoride_NonBiogenic" }, - "eia/INTL.4008-8-MMTCD.A": { - "name": "CO2 emissions, Annual", - "statVar": "eia/INTL.4008-8-MMTCD.A" + "Annual_Emissions_SulfurHexafluoride_NonBiogenic_multiple_place_bar_block": { + "name": "Annual Amount of Emissions: Non Biogenic Emission Source, Sulfur Hexafluoride", + "statVar": "Annual_Emissions_SulfurHexafluoride_NonBiogenic" } } } ], "metadata": { "placeDcid": [ - "country/USA" + "geoId/48157" ] } }, @@ -540,18 +605,18 @@ "entities": [], "pastSourceContext": "", "place": { - "dcid": "country/USA", - "name": "United States", - "place_type": "Country" + "dcid": "geoId/48157", + "name": "Fort Bend County", + "place_type": "County" }, "placeFallback": { "newPlace": { "country": null, - "dcid": "country/USA", - "name": "United States", - "place_type": "Country" + "dcid": "geoId/48157", + "name": "Fort Bend County", + "place_type": "County" }, - "newStr": "United States", + "newStr": "Fort Bend County", "origPlace": { "country": "country/USA", "dcid": "geoId/4835000", @@ -563,9 +628,9 @@ "placeSource": "CURRENT_QUERY", "places": [ { - "dcid": "country/USA", - "name": "United States", - "place_type": "Country" + "dcid": "geoId/48157", + "name": "Fort Bend County", + "place_type": "County" } ], "relatedThings": { @@ -618,6 +683,6 @@ }, "svSource": "CURRENT_QUERY", "userMessages": [ - "Sorry, there were no relevant statistics for Houston. See results for United States." + "Sorry, there were no relevant statistics for Houston. See results for Fort Bend County." ] } \ No newline at end of file diff --git a/server/integration_tests/test_data/e2e_triple/tellmeaboutheartdisease/chart_config.json b/server/integration_tests/test_data/e2e_triple/tellmeaboutheartdisease/chart_config.json index 64ff7b878e..6d0ef76d9c 100644 --- a/server/integration_tests/test_data/e2e_triple/tellmeaboutheartdisease/chart_config.json +++ b/server/integration_tests/test_data/e2e_triple/tellmeaboutheartdisease/chart_config.json @@ -27,7 +27,7 @@ "entities": [ { "dcid": "bio/DOID_114", - "name": "heart disease", + "name": "Heart disease", "type": "" } ], diff --git a/server/integration_tests/test_data/e2e_triple/whatistheprevalenceofheartdiseaseincalifornia/chart_config.json b/server/integration_tests/test_data/e2e_triple/whatistheprevalenceofheartdiseaseincalifornia/chart_config.json index e923979d38..f42f8f725f 100644 --- a/server/integration_tests/test_data/e2e_triple/whatistheprevalenceofheartdiseaseincalifornia/chart_config.json +++ b/server/integration_tests/test_data/e2e_triple/whatistheprevalenceofheartdiseaseincalifornia/chart_config.json @@ -471,7 +471,7 @@ "entities": [ { "dcid": "bio/DOID_114", - "name": "heart disease", + "name": "Heart disease", "type": "" } ],