From e538b6f1f49f6ad54151c6dab26606ed3d7b4f4e Mon Sep 17 00:00:00 2001 From: Jennifer Chen Date: Mon, 21 Oct 2024 12:52:07 -0700 Subject: [PATCH 1/4] update goldens --- .../demo_fallback/query_4/chart_config.json | 29 + .../demo_feb2023/query_5/chart_config.json | 100 +- .../detection_api_basic/chart_config.json | 16 +- .../whatisthephylumofvolvox/debug_info.json | 143 +-- .../debug_info.json | 10 +- .../debug_info.json | 6 +- .../detection_api_sdg_idx/chart_config.json | 6 +- .../chart_config.json | 86 ++ .../chart_config.json | 153 +-- .../chart_config.json | 64 ++ .../chart_config.json | 48 + .../chart_config.json | 64 ++ .../chart_config.json | 947 +++++++++++++++++- .../chart_config.json | 88 +- .../chart_config.json | 440 ++++---- .../international/query_2/chart_config.json | 32 + 16 files changed, 1691 insertions(+), 541 deletions(-) diff --git a/server/integration_tests/test_data/demo_fallback/query_4/chart_config.json b/server/integration_tests/test_data/demo_fallback/query_4/chart_config.json index c26f445cd3..33f44004c0 100644 --- a/server/integration_tests/test_data/demo_fallback/query_4/chart_config.json +++ b/server/integration_tests/test_data/demo_fallback/query_4/chart_config.json @@ -827,6 +827,35 @@ "denom": "Count_Person", "title": "People With Only Private Health Insurance in Counties of California" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Number of Deaths in California", + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths" + }, { "columns": [ { diff --git a/server/integration_tests/test_data/demo_feb2023/query_5/chart_config.json b/server/integration_tests/test_data/demo_feb2023/query_5/chart_config.json index 77cbfebe65..8d11116f3a 100644 --- a/server/integration_tests/test_data/demo_feb2023/query_5/chart_config.json +++ b/server/integration_tests/test_data/demo_feb2023/query_5/chart_config.json @@ -12,12 +12,12 @@ "statVarKey": [ "Count_Worker_NAICSHealthCareSocialAssistance", "dc/p69tpsldf99h7", - "Count_Worker_NAICSConstruction", "Count_Worker_NAICSAccommodationFoodServices", - "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices", + "Count_Worker_NAICSConstruction", "Count_Worker_NAICSProfessionalScientificTechnicalServices", - "Count_Worker_NAICSArtsEntertainmentRecreation", "Count_Worker_NAICSEducationalServices", + "Count_Worker_NAICSArtsEntertainmentRecreation", + "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices", "Count_Worker_NAICSOtherServices", "Count_Worker_NAICSFinanceInsurance", "Count_Worker_NAICSRealEstateRentalLeasing", @@ -67,9 +67,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSConstruction_growth_abs" + "Count_Worker_NAICSAccommodationFoodServices_growth_abs" ], - "title": "Population Working in the Construction Industry in Placer County", + "title": "Accommodation/Food Industry Workers in Placer County", "type": "LINE" } ] @@ -78,9 +78,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAccommodationFoodServices_growth_abs" + "Count_Worker_NAICSConstruction_growth_abs" ], - "title": "Accommodation/Food Industry Workers in Placer County", + "title": "Population Working in the Construction Industry in Placer County", "type": "LINE" } ] @@ -89,9 +89,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_abs" + "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_abs" ], - "title": "Admin / Waste Management Service Industry Workers in Placer County", + "title": "Professional, Scientific, and Technical Services Workers in Placer County", "type": "LINE" } ] @@ -100,9 +100,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_abs" + "Count_Worker_NAICSEducationalServices_growth_abs" ], - "title": "Professional, Scientific, and Technical Services Workers in Placer County", + "title": "Educational Services Industry Workers in Placer County", "type": "LINE" } ] @@ -122,9 +122,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSEducationalServices_growth_abs" + "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_abs" ], - "title": "Educational Services Industry Workers in Placer County", + "title": "Admin / Waste Management Service Industry Workers in Placer County", "type": "LINE" } ] @@ -271,9 +271,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSArtsEntertainmentRecreation_growth_pct" + "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_pct" ], - "title": "Arts, Entertainment, Recreation Industry Workers in Placer County", + "title": "Professional, Scientific, and Technical Services Workers in Placer County", "type": "LINE" } ] @@ -293,9 +293,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_pct" + "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_pct" ], - "title": "Professional, Scientific, and Technical Services Workers in Placer County", + "title": "Admin / Waste Management Service Industry Workers in Placer County", "type": "LINE" } ] @@ -304,9 +304,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_pct" + "Count_Worker_NAICSArtsEntertainmentRecreation_growth_pct" ], - "title": "Admin / Waste Management Service Industry Workers in Placer County", + "title": "Arts, Entertainment, Recreation Industry Workers in Placer County", "type": "LINE" } ] @@ -326,9 +326,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSMiningQuarryingOilGasExtraction_growth_pct" + "Count_Worker_NAICSWholesaleTrade_growth_pct" ], - "title": "Mining, Quarrying, Oil and Gas Extraction Industry Workers in Placer County", + "title": "Wholesale Trade Workers in Placer County", "type": "LINE" } ] @@ -337,9 +337,9 @@ "tiles": [ { "statVarKey": [ - "dc/8p97n7l96lgg8_growth_pct" + "Count_Worker_NAICSRealEstateRentalLeasing_growth_pct" ], - "title": "Transportation and Warehousing Workers in Placer County", + "title": "Real Estate and Rental and Leasing Workers in Placer County", "type": "LINE" } ] @@ -348,9 +348,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSWholesaleTrade_growth_pct" + "dc/8p97n7l96lgg8_growth_pct" ], - "title": "Wholesale Trade Workers in Placer County", + "title": "Transportation and Warehousing Workers in Placer County", "type": "LINE" } ] @@ -359,9 +359,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSRealEstateRentalLeasing_growth_pct" + "Count_Worker_NAICSConstruction_growth_pct" ], - "title": "Real Estate and Rental and Leasing Workers in Placer County", + "title": "Population Working in the Construction Industry in Placer County", "type": "LINE" } ] @@ -370,9 +370,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSConstruction_growth_pct" + "Count_Worker_NAICSAccommodationFoodServices_growth_pct" ], - "title": "Population Working in the Construction Industry in Placer County", + "title": "Accommodation/Food Industry Workers in Placer County", "type": "LINE" } ] @@ -403,9 +403,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAccommodationFoodServices_growth_pct" + "dc/p69tpsldf99h7_growth_pct" ], - "title": "Accommodation/Food Industry Workers in Placer County", + "title": "Retail Trade Workers in Placer County", "type": "LINE" } ] @@ -425,9 +425,9 @@ "tiles": [ { "statVarKey": [ - "dc/p69tpsldf99h7_growth_pct" + "Count_Worker_NAICSPublicAdministration_growth_pct" ], - "title": "Retail Trade Workers in Placer County", + "title": "Public Administration Workers in Placer County", "type": "LINE" } ] @@ -447,9 +447,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSPublicAdministration_growth_pct" + "Count_Worker_NAICSInformation_growth_pct" ], - "title": "Public Administration Workers in Placer County", + "title": "Information Industry Workers in Placer County", "type": "LINE" } ] @@ -458,9 +458,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSInformation_growth_pct" + "Count_Worker_NAICSMiningQuarryingOilGasExtraction_growth_pct" ], - "title": "Information Industry Workers in Placer County", + "title": "Mining, Quarrying, Oil and Gas Extraction Industry Workers in Placer County", "type": "LINE" } ] @@ -497,9 +497,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSConstruction_growth_pc" + "Count_Worker_NAICSAccommodationFoodServices_growth_pc" ], - "title": "Population Working in the Construction Industry in Placer County", + "title": "Accommodation/Food Industry Workers in Placer County", "type": "LINE" } ] @@ -508,9 +508,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAccommodationFoodServices_growth_pc" + "Count_Worker_NAICSConstruction_growth_pc" ], - "title": "Accommodation/Food Industry Workers in Placer County", + "title": "Population Working in the Construction Industry in Placer County", "type": "LINE" } ] @@ -519,9 +519,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_pc" + "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_pc" ], - "title": "Admin / Waste Management Service Industry Workers in Placer County", + "title": "Professional, Scientific, and Technical Services Workers in Placer County", "type": "LINE" } ] @@ -530,9 +530,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_pc" + "Count_Worker_NAICSEducationalServices_growth_pc" ], - "title": "Professional, Scientific, and Technical Services Workers in Placer County", + "title": "Educational Services Industry Workers in Placer County", "type": "LINE" } ] @@ -552,9 +552,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSEducationalServices_growth_pc" + "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_pc" ], - "title": "Educational Services Industry Workers in Placer County", + "title": "Admin / Waste Management Service Industry Workers in Placer County", "type": "LINE" } ] @@ -1199,6 +1199,12 @@ }, "childTopics": [], "exploreMore": { + "Count_Worker_NAICSProfessionalScientificTechnicalServices": { + "establishmentOwnership": [ + "Count_Worker_FederalGovernmentOwnedEstablishment_NAICSProfessionalScientificTechnicalServices", + "Count_Worker_LocalGovernmentOwnedEstablishment_NAICSProfessionalScientificTechnicalServices" + ] + }, "dc/8p97n7l96lgg8": { "establishmentOwnership": [ "dc/wkn0fmqw6ezxc", diff --git a/server/integration_tests/test_data/detection_api_basic/chart_config.json b/server/integration_tests/test_data/detection_api_basic/chart_config.json index d2337fa97a..12ec8162dd 100644 --- a/server/integration_tests/test_data/detection_api_basic/chart_config.json +++ b/server/integration_tests/test_data/detection_api_basic/chart_config.json @@ -1,10 +1,6 @@ { "childEntityType": "", - "classifications": [ - { - "type": 100 - } - ], + "classifications": [], "client": "test_detect", "comparisonEntities": [], "comparisonVariables": [], @@ -17,13 +13,5 @@ "properties": [], "sessionId": "007_999999999", "test": "unittest", - "variables": [ - "dc/topic/CommuteTime", - "dc/topic/WorkCommute", - "dc/topic/CommuteMode", - "dc/topic/CommuteModeByOccupation", - "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome", - "dc/hbkh95kc7pkb6", - "dc/wc8q05drd74bd" - ] + "variables": [] } \ 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 046cbf177a..a199fa8511 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 @@ -3,126 +3,18 @@ "places_resolved": "", "main_place_dcid": "", "main_place_name": "", - "entities_detected": [ - "volvox" - ], - "entities_resolved": "(name: Volvox, dcid: bio/D044446); ", - "query_with_places_removed": "what is the phylum of", + "entities_detected": [], + "entities_resolved": "", + "query_with_places_removed": "", "sv_matching": { - "CosineScore": [ - 0.35510891675949097, - 0.34608712792396545, - 0.34525778889656067, - 0.34484589099884033, - 0.3411365747451782, - 0.3384982645511627, - 0.3349902927875519, - 0.33166080713272095, - 0.32600581645965576, - 0.32424452900886536, - 0.32060614228248596, - 0.3142656087875366, - 0.31276530027389526, - 0.3126294016838074, - 0.31250450015068054, - 0.31177398562431335, - 0.31033891439437866, - 0.3100748062133789, - 0.3098834156990051, - 0.30805402994155884, - 0.3074587285518646, - 0.30719631910324097, - 0.3039420545101166 - ], + "CosineScore": [], "MultiSV": {}, - "Query": "what is the phylum of", - "SV": [ - "dc/topic/SDGBiodiversity", - "Count_Person_5OrMoreYears_OtherIndicLanguagesSpokenAtHome", - "Annual_Amount_Emissions_Phenol_SCC_28_MiscellaneousAreaSources", - "Annual_Amount_Emissions_Phenol_SCC_3_IndustrialProcesses", - "Annual_Amount_Emissions_Phenol_SCC_26_WasteDisposalTreatmentAndRecovery", - "Count_Person_5OrMoreYears_GreekSpokenAtHome", - "Annual_Amount_Emissions_Phenol_SCC_23_IndustrialProcesses", - "Amount_FarmInventory_SorghumForSilageOrGreenchop", - "Count_Person_5OrMoreYears_PersianInclFarsiDariSpokenAtHome", - "Count_Person_SpeakEnglishLessThanVeryWell_5OrMoreYears_PersianSpokenAtHome", - "Count_Farm_SorghumForSilageOrGreenchop", - "Annual_Amount_Emissions_Phenol_SCC_22_MobileSources", - "Count_Person_SpeakEnglishLessThanVeryWell_5OrMoreYears_PersianInclFarsiDariSpokenAtHome", - "Amount_FarmInventory_BarleyForGrain", - "Count_Person_5OrMoreYears_OtherAndUnspecifiedLanguagesSpokenAtHome", - "Count_Person_5OrMoreYears_MalayalamKannadaOrOtherDravidianLanguagesSpokenAtHome", - "Amount_FarmInventory_DurumWheatForGrain", - "Count_Person_SpeakEnglishVeryWell_5OrMoreYears_PersianInclFarsiDariSpokenAtHome", - "Count_Person_SpeakEnglishVeryWell_5OrMoreYears_MalayalamKannadaOrOtherDravidianLanguagesSpokenAtHome", - "Count_Person_SpeakEnglishVeryWell_5OrMoreYears_GreekSpokenAtHome", - "Annual_Amount_Emissions_Phenol_SCC_2_InternalCombustionEngines", - "Amount_FarmInventory_CornForSilageOrGreenchop", - "Count_Person_5OrMoreYears_OtherSlavicLanguagesSpokenAtHome" - ] + "Query": "What is the phylum of volvox", + "SV": [] }, "props_matching": { - "CosineScore": [ - 1.0000001192092896, - 0.47528403997421265, - 0.3615415692329407, - 0.3420097827911377, - 0.32933083176612854, - 0.3184516429901123, - 0.3146698474884033, - 0.3083950877189636, - 0.30794060230255127, - 0.3046301305294037, - 0.2827085256576538, - 0.2818753123283386, - 0.28082767128944397, - 0.28045278787612915, - 0.2742983102798462, - 0.2715049386024475, - 0.27071818709373474, - 0.2695465385913849, - 0.25990062952041626, - 0.25990062952041626, - 0.24827902019023895, - 0.24662014842033386, - 0.24632105231285095, - 0.24616341292858124, - 0.24212220311164856, - 0.23135532438755035, - 0.2296244204044342, - 0.2277354896068573 - ], - "PROP": [ - "phylum", - "chemblID", - "geneID", - "virusGenus", - "typeOfGene", - "fullName", - "ensemblID", - "simplifiedMolecularInputLineEntrySystem", - "geneticVariantFunctionalCategory", - "imageUrl", - "genomicCoordinates", - "chromosomeSize", - "observedAllele", - "hg38GenomicPosition", - "hg19GenomicPosition", - "virusHost", - "strandOrientation", - "ncbiDNASequenceName", - "<-geneSymbol{typeOf:GeneticVariantGeneAssociation}->referenceSNPClusterID", - "<-referenceSNPClusterID{typeOf:GeneticVariantGeneAssociation}->geneSymbol", - "ncbiProteinAccessionNumber", - "alleleType", - "hg38GenomicLocation", - "ofVirusSpecies", - "hg19GenomicLocation", - "ncbiTaxonID", - "antigenType", - "alleleOrigin" - ] + "CosineScore": [], + "PROP": [] }, "query_detection_debug_logs": { "dc_recognize_entities": { @@ -131,20 +23,29 @@ ] }, "dc_recognize_places": {}, + "llm_response": { + "COMPARE": null, + "COMPARISON_FILTER": [], + "DISASTER_EVENT": null, + "GROWTH": null, + "METRICS": [], + "PLACES": [], + "RANK": null, + "RANKING_FILTER": [], + "SUB_PLACE_TYPE": null, + "SUPERLATIVE": null, + "UNSAFE": false + }, "main_place_inferred": null, "original_query": "What is the phylum of volvox", "place_dcid_inference": "Place DCID Inference did not trigger (no place strings found).", "place_resolution": "Place resolution did not trigger (no place dcids found).", "places_found_str": [], "query_transformations": { - "place_detection_input": "What is the phylum of volvox", - "place_detection_with_places_removed": "what is the phylum of", "sv_detection_query_index_types": [ "medium_ft", "bio_ft" - ], - "sv_detection_query_input": "what is the phylum of", - "sv_detection_query_stop_words_removal": "phylum" + ] } } } \ 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 ad8b8b93ac..75945a07f5 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.9257859587669373 + 0.9257858991622925 ], "QueryPart": "male population", "SV": [ @@ -64,7 +64,7 @@ { "CosineScore": [ 0.9296979904174805, - 0.884743332862854 + 0.8847434520721436 ], "QueryPart": "female population", "SV": [ @@ -89,7 +89,7 @@ }, { "CosineScore": [ - 0.8982378244400024, + 0.8982377648353577, 0.8723466396331787 ], "QueryPart": "population", @@ -106,10 +106,10 @@ "Parts": [ { "CosineScore": [ - 0.8088873028755188, + 0.808887243270874, 0.8034241199493408, 0.8017654418945312, - 0.7751557230949402 + 0.775155782699585 ], "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 6c44d9f4bd..ff1a8fda0b 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 @@ -41,7 +41,7 @@ "Parts": [ { "CosineScore": [ - 0.8787485361099243 + 0.8787486553192139 ], "QueryPart": "show climate change", "SV": [ @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999998807907104 + 0.9999998211860657 ], "QueryPart": "drought", "SV": [ @@ -76,7 +76,7 @@ }, { "CosineScore": [ - 0.8665127158164978 + 0.866512656211853 ], "QueryPart": "change drought", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_sdg_idx/chart_config.json b/server/integration_tests/test_data/detection_api_sdg_idx/chart_config.json index 160f8d4439..2daf1a9f30 100644 --- a/server/integration_tests/test_data/detection_api_sdg_idx/chart_config.json +++ b/server/integration_tests/test_data/detection_api_sdg_idx/chart_config.json @@ -1,10 +1,6 @@ { "childEntityType": "", - "classifications": [ - { - "type": 100 - } - ], + "classifications": [], "client": "test_detect", "comparisonEntities": [], "comparisonVariables": [], diff --git a/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniacountiesbefore2020/chart_config.json b/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniacountiesbefore2020/chart_config.json index 4a42baee50..2af3bf0317 100644 --- a/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniacountiesbefore2020/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniacountiesbefore2020/chart_config.json @@ -217,6 +217,38 @@ "denom": "Count_Person", "title": "Count of Mortality Event: Female in Counties of California" }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "endDate": "2019" + }, + "statVarKey": [ + "Count_Death_Female_1151455814" + ], + "title": "Count of Mortality Event: Female in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Count of Mortality Event: Female in California", + "statVarKey": [ + "Count_Death_Female_2019" + ], + "title": "Count of Mortality Event: Female in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female" + }, { "columns": [ { @@ -889,11 +921,21 @@ } ], "statVarSpec": { + "Count_Death_Female_1151455814": { + "facetId": "1151455814", + "name": "Count of Mortality Event: Female", + "statVar": "Count_Death_Female" + }, "Count_Death_Female_2017": { "date": "2017", "name": "Count of Mortality Event: Female", "statVar": "Count_Death_Female" }, + "Count_Death_Female_2019": { + "date": "2019", + "name": "Count of Mortality Event: Female", + "statVar": "Count_Death_Female" + }, "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female_1118952551": { "facetId": "1118952551", "name": "Population: Bachelors Degree or Higher, Female", @@ -1421,6 +1463,50 @@ }, "childTopics": [], "exploreMore": { + "Count_Death_Female": { + "age": [ + "Count_Death_10To14Years_Female", + "Count_Death_15To19Years_Female", + "Count_Death_15To64Years_Female", + "Count_Death_20To24Years_Female", + "Count_Death_25To29Years_Female", + "Count_Death_30To34Years_Female", + "Count_Death_35To39Years_Female", + "Count_Death_40To44Years_Female", + "Count_Death_45To49Years_Female", + "Count_Death_50To54Years_Female", + "Count_Death_55To59Years_Female", + "Count_Death_5To9Years_Female", + "Count_Death_60To64Years_Female", + "Count_Death_65OrMoreYears_Female", + "Count_Death_65To69Years_Female", + "Count_Death_70To74Years_Female", + "Count_Death_75To79Years_Female", + "Count_Death_80OrMoreYears_Female", + "Count_Death_Upto14Years_Female", + "Count_Death_Upto4Years_Female" + ], + "causeOfDeath": [ + "Count_MortalityEvent_AIDS_Female", + "Count_MortalityEvent_AccidentalDischargeOfFirearms_Female", + "Count_MortalityEvent_AccidentalDrowningAndSubmersion_Female", + "Count_MortalityEvent_AccidentalExposureToSmokeFireAndFlames_Female", + "Count_MortalityEvent_AccidentalPoisoningAndExposureToNoxiousSubstances_Female", + "Count_MortalityEvent_Accidents(UnintentionalInjuries)_Female", + "Count_MortalityEvent_AcuteAndRapidlyProgressiveNephriticAndNephroticSyndrome_Female", + "Count_MortalityEvent_AcuteAndSubacuteEndocarditis_Female", + "Count_MortalityEvent_AcuteBronchitisAndBronchiolitis_Female", + "Count_MortalityEvent_AcuteMyocardialInfarction_Female", + "Count_MortalityEvent_AcuteRheumaticFeverAndChronicRheumaticHeartDiseases_Female", + "Count_MortalityEvent_AlcoholicLiverDisease_Female", + "Count_MortalityEvent_AllOtherAndUnspecifiedMalignantNeoplasms_Female", + "Count_MortalityEvent_AllOtherDiseases(Residual)_Female", + "Count_MortalityEvent_AllOtherFormsOfChronicIschemicHeartDisease_Female", + "Count_MortalityEvent_AllOtherFormsOfHeartDisease_Female", + "Count_MortalityEvent_AlzheimersDisease_Female", + "Count_MortalityEvent_AorticAneurysmAndDissection_Female" + ] + }, "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female": { "age": [ "Count_Person_18To24Years_EducationalAttainmentBachelorsDegreeOrHigher_Female", diff --git a/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniasinceapr2019/chart_config.json b/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniasinceapr2019/chart_config.json index ad397d72ea..41211576d7 100644 --- a/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniasinceapr2019/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniasinceapr2019/chart_config.json @@ -185,6 +185,38 @@ "denom": "Count_Person", "title": "Non-Separated Married Women in Counties of California" }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2019" + }, + "statVarKey": [ + "Count_Death_Female_1151455814" + ], + "title": "Count of Mortality Event: Female in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Count of Mortality Event: Female in California", + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female" + }, { "columns": [ { @@ -854,81 +886,17 @@ ], "denom": "Count_Person", "title": "Foreign Born Women" - }, - { - "columns": [ - { - "tiles": [ - { - "lineTileSpec": { - "startDate": "2019" - }, - "statVarKey": [ - "Count_Person_16OrMoreYears_Female_WithEarnings_1472009826" - ], - "title": "Population: 16 Years or More, Female, With Earnings in California", - "type": "LINE" - } - ] - }, - { - "tiles": [ - { - "description": "Population: 16 Years or More, Female, With Earnings in California", - "statVarKey": [ - "Count_Person_16OrMoreYears_Female_WithEarnings" - ], - "title": "Population: 16 Years or More, Female, With Earnings in California", - "type": "HIGHLIGHT" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population: 16 Years or More, Female, With Earnings" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_16OrMoreYears_Female_WithEarnings" - ], - "title": "Population: 16 Years or More, Female, With Earnings in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_16OrMoreYears_Female_WithEarnings" - ], - "title": "Population: 16 Years or More, Female, With Earnings in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population: 16 Years or More, Female, With Earnings in Counties of California" } ], "statVarSpec": { - "Count_Person_16OrMoreYears_Female_WithEarnings": { - "name": "Population: 16 Years or More, Female, With Earnings", - "statVar": "Count_Person_16OrMoreYears_Female_WithEarnings" + "Count_Death_Female": { + "name": "Count of Mortality Event: Female", + "statVar": "Count_Death_Female" }, - "Count_Person_16OrMoreYears_Female_WithEarnings_1472009826": { - "facetId": "1472009826", - "name": "Population: 16 Years or More, Female, With Earnings", - "statVar": "Count_Person_16OrMoreYears_Female_WithEarnings" + "Count_Death_Female_1151455814": { + "facetId": "1151455814", + "name": "Count of Mortality Event: Female", + "statVar": "Count_Death_Female" }, "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female": { "name": "Population: Bachelors Degree or Higher, Female", @@ -1443,6 +1411,49 @@ }, "childTopics": [], "exploreMore": { + "Count_Death_Female": { + "age": [ + "Count_Death_10To14Years_Female", + "Count_Death_15To19Years_Female", + "Count_Death_15To64Years_Female", + "Count_Death_20To24Years_Female", + "Count_Death_25To29Years_Female", + "Count_Death_30To34Years_Female", + "Count_Death_35To39Years_Female", + "Count_Death_40To44Years_Female", + "Count_Death_45To49Years_Female", + "Count_Death_50To54Years_Female", + "Count_Death_55To59Years_Female", + "Count_Death_5To9Years_Female", + "Count_Death_60To64Years_Female", + "Count_Death_65OrMoreYears_Female", + "Count_Death_65To69Years_Female", + "Count_Death_70To74Years_Female", + "Count_Death_75To79Years_Female", + "Count_Death_80OrMoreYears_Female", + "Count_Death_Upto14Years_Female", + "Count_Death_Upto4Years_Female" + ], + "causeOfDeath": [ + "Count_MortalityEvent_AIDS_Female", + "Count_MortalityEvent_AccidentalDrowningAndSubmersion_Female", + "Count_MortalityEvent_AccidentalExposureToSmokeFireAndFlames_Female", + "Count_MortalityEvent_AccidentalPoisoningAndExposureToNoxiousSubstances_Female", + "Count_MortalityEvent_Accidents(UnintentionalInjuries)_Female", + "Count_MortalityEvent_AcuteAndRapidlyProgressiveNephriticAndNephroticSyndrome_Female", + "Count_MortalityEvent_AcuteAndSubacuteEndocarditis_Female", + "Count_MortalityEvent_AcuteBronchitisAndBronchiolitis_Female", + "Count_MortalityEvent_AcuteMyocardialInfarction_Female", + "Count_MortalityEvent_AcuteRheumaticFeverAndChronicRheumaticHeartDiseases_Female", + "Count_MortalityEvent_AlcoholicLiverDisease_Female", + "Count_MortalityEvent_AllOtherAndUnspecifiedMalignantNeoplasms_Female", + "Count_MortalityEvent_AllOtherDiseases(Residual)_Female", + "Count_MortalityEvent_AllOtherFormsOfChronicIschemicHeartDisease_Female", + "Count_MortalityEvent_AllOtherFormsOfHeartDisease_Female", + "Count_MortalityEvent_AlzheimersDisease_Female", + "Count_MortalityEvent_AorticAneurysmAndDissection_Female" + ] + }, "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female": { "age": [ "Count_Person_18To24Years_EducationalAttainmentBachelorsDegreeOrHigher_Female", 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 9b8a9d4c5d..36c9afa15b 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 @@ -150,6 +150,38 @@ ], "title": "Life Expectancy by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths in States of United States" + }, { "columns": [ { @@ -278,6 +310,38 @@ ], "title": "Causes of Death" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female in States of United States" + }, { "columns": [ { 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 12d8754f1b..ef57c0251c 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 @@ -205,6 +205,38 @@ "denom": "Count_Person", "title": "Count of Mortality Event: Female" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in States of United States of America (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in States of United States of America (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female in States of United States of America" + }, { "columns": [ { @@ -1626,6 +1658,7 @@ "age": [ "Count_Person_0To4Years_Female_WhiteAlone", "Count_Person_0Years_Female_WhiteAlone", + "Count_Person_100Years_Female_WhiteAlone", "Count_Person_10To14Years_Female_WhiteAlone", "Count_Person_10Years_Female_WhiteAlone", "Count_Person_11Years_Female_WhiteAlone", @@ -1728,7 +1761,22 @@ "Count_Person_83Years_Female_WhiteAlone", "Count_Person_84Years_Female_WhiteAlone", "Count_Person_85OrMoreYears_Female_WhiteAlone", + "Count_Person_85Years_Female_WhiteAlone", + "Count_Person_86Years_Female_WhiteAlone", + "Count_Person_87Years_Female_WhiteAlone", + "Count_Person_88Years_Female_WhiteAlone", + "Count_Person_89Years_Female_WhiteAlone", "Count_Person_8Years_Female_WhiteAlone", + "Count_Person_90Years_Female_WhiteAlone", + "Count_Person_91Years_Female_WhiteAlone", + "Count_Person_92Years_Female_WhiteAlone", + "Count_Person_93Years_Female_WhiteAlone", + "Count_Person_94Years_Female_WhiteAlone", + "Count_Person_95Years_Female_WhiteAlone", + "Count_Person_96Years_Female_WhiteAlone", + "Count_Person_97Years_Female_WhiteAlone", + "Count_Person_98Years_Female_WhiteAlone", + "Count_Person_99Years_Female_WhiteAlone", "Count_Person_9Years_Female_WhiteAlone" ] }, diff --git a/server/integration_tests/test_data/e2e_single_date/lifeexpectancyinusstatesin2018/chart_config.json b/server/integration_tests/test_data/e2e_single_date/lifeexpectancyinusstatesin2018/chart_config.json index 83645c11d0..0dcbadae0c 100644 --- a/server/integration_tests/test_data/e2e_single_date/lifeexpectancyinusstatesin2018/chart_config.json +++ b/server/integration_tests/test_data/e2e_single_date/lifeexpectancyinusstatesin2018/chart_config.json @@ -150,6 +150,38 @@ ], "title": "Life Expectancy by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_2018" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_2018" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths in States of United States" + }, { "columns": [ { @@ -278,6 +310,38 @@ ], "title": "Causes of Death" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Female_2018" + ], + "title": "Count of Mortality Event: Female in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Female_2018" + ], + "title": "Count of Mortality Event: Female in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female in States of United States" + }, { "columns": [ { diff --git a/server/integration_tests/test_data/e2e_single_date/populationintheusinthelastyear/chart_config.json b/server/integration_tests/test_data/e2e_single_date/populationintheusinthelastyear/chart_config.json index 6e5905ebc3..6399b25bc3 100644 --- a/server/integration_tests/test_data/e2e_single_date/populationintheusinthelastyear/chart_config.json +++ b/server/integration_tests/test_data/e2e_single_date/populationintheusinthelastyear/chart_config.json @@ -13,7 +13,7 @@ "startDate": "2023" }, "statVarKey": [ - "Count_Person_3981252704" + "Count_Person_2176550201" ], "title": "Population in United States", "type": "LINE" @@ -35,6 +35,99 @@ ], "title": "Population" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person" + ], + "title": "Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person" + ], + "title": "Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Person_PerArea_1151455814" + ], + "title": "Population Density in United States", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Population Density in United States", + "statVarKey": [ + "Count_Person_PerArea" + ], + "title": "Population Density in United States", + "type": "HIGHLIGHT" + } + ] + } + ], + "title": "Population Density" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_PerArea" + ], + "title": "Population Density in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_PerArea" + ], + "title": "Population Density in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Population Density in States of United States" + }, { "columns": [ { @@ -44,27 +137,549 @@ "startDate": "2023" }, "statVarKey": [ - "GrowthRate_Count_Person_3981252704" + "GrowthRate_Count_Person_3981252704" + ], + "title": "Rate of Population Growth in United States", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Rate of Population Growth in United States", + "statVarKey": [ + "GrowthRate_Count_Person" + ], + "title": "Rate of Population Growth in United States", + "type": "HIGHLIGHT" + } + ] + } + ], + "title": "Rate of Population Growth" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_85OrMoreYears_Female" + ], + "title": "Women Over 85 in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Female" + ], + "title": "Women Over 85 in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Women Over 85 in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_85OrMoreYears_Male" + ], + "title": "Men Over 85 in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Male" + ], + "title": "Men Over 85 in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Men Over 85 in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Person_Female_3999249536", + "Count_Person_Male_3999249536" + ], + "title": "Population by Gender in United States", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population by Gender" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Female" + ], + "title": "Women in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Female" + ], + "title": "Women in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Women in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Male" + ], + "title": "Men in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Male" + ], + "title": "Men in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Men in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Person_WhiteAlone_3935616881", + "Count_Person_BlackOrAfricanAmericanAlone_3935616881", + "Count_Person_HispanicOrLatino_2317674805", + "Count_Person_AsianAlone_3935616881", + "Count_Person_AmericanIndianAndAlaskaNativeAlone_3935616881" + ], + "title": "Monoracial Breakdown in United States", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Monoracial Breakdown" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_WhiteAlone" + ], + "title": "White Monoracial Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_WhiteAlone" + ], + "title": "White Monoracial Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "White Monoracial Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_BlackOrAfricanAmericanAlone" + ], + "title": "Black Monoracial Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_BlackOrAfricanAmericanAlone" + ], + "title": "Black Monoracial Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Black Monoracial Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881", + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881", + "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881", + "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881", + "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881" + ], + "title": "Monoracial/multiracial Breakdown in United States", + "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 States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "Asian Population, Monoracial/Multiracial in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" ], - "title": "Rate of Population Growth in United States", - "type": "LINE" + "title": "Asian Population, Monoracial/Multiracial in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Asian Population, Monoracial/Multiracial in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "country/USA" + ], + "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 United States (${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 States of United States (${date})", + "type": "MAP" } ] }, { "tiles": [ { - "description": "Rate of Population Growth in United States", + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, "statVarKey": [ - "GrowthRate_Count_Person" + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" ], - "title": "Rate of Population Growth in United States", - "type": "HIGHLIGHT" + "title": "Hispanic American Indian Population in States of United States (${date})", + "type": "RANKING" } ] } ], - "title": "Rate of Population Growth" + "denom": "Count_Person", + "title": "Hispanic American Indian Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_HispanicOrLatino_AsianAlone" + ], + "title": "Hispanic Asian Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_HispanicOrLatino_AsianAlone" + ], + "title": "Hispanic Asian Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Hispanic Asian Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "country/USA" + ], + "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 United States (${date})", + "type": "BAR" + } + ] + } + ], + "denom": "Count_Person", + "title": "Racial Breakdown With Non Hispanic Consideration" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_WhiteAloneNotHispanicOrLatino" + ], + "title": "White Hispanic Monoracial Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_WhiteAloneNotHispanicOrLatino" + ], + "title": "White Hispanic Monoracial Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "White Hispanic Monoracial Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + ], + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + ], + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in States of United States" }, { "columns": [ @@ -291,18 +906,141 @@ ], "denom": "Count_Person", "title": "Population: Household" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Death_1151455814" + ], + "title": "Number of Deaths in United States", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Number of Deaths in United States", + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in United States", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths in States of United States" } ], "statVarSpec": { + "Count_Death": { + "name": "Number of Deaths", + "statVar": "Count_Death" + }, + "Count_Death_1151455814": { + "facetId": "1151455814", + "name": "Number of Deaths", + "statVar": "Count_Death" + }, "Count_Person": { "name": "Population", "statVar": "Count_Person" }, - "Count_Person_3981252704": { - "facetId": "3981252704", + "Count_Person_2176550201": { + "facetId": "2176550201", "name": "Population", "statVar": "Count_Person" }, + "Count_Person_85OrMoreYears_Female": { + "name": "Women over 85", + "statVar": "Count_Person_85OrMoreYears_Female" + }, + "Count_Person_85OrMoreYears_Male": { + "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_3935616881": { + "facetId": "3935616881", + "name": "American Indian and Alaska Native Population, Monoracial/Multiracial", + "statVar": "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_AmericanIndianAndAlaskaNativeAlone_3935616881": { + "facetId": "3935616881", + "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_3935616881": { + "facetId": "3935616881", + "name": "Asian Population, Monoracial/Multiracial", + "statVar": "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_AsianAlone_3935616881": { + "facetId": "3935616881", + "name": "Population Asian Alone", + "statVar": "Count_Person_AsianAlone" + }, + "Count_Person_BlackOrAfricanAmericanAlone": { + "name": "Black Monoracial Population", + "statVar": "Count_Person_BlackOrAfricanAmericanAlone" + }, + "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881": { + "facetId": "3935616881", + "name": "Black Population, Monoracial/Multiracial", + "statVar": "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_BlackOrAfricanAmericanAlone_3935616881": { + "facetId": "3935616881", + "name": "Black Monoracial Population", + "statVar": "Count_Person_BlackOrAfricanAmericanAlone" + }, "Count_Person_Employed": { "name": "Population With Current Employment", "statVar": "Count_Person_Employed" @@ -312,6 +1050,68 @@ "name": "Population With Current Employment", "statVar": "Count_Person_Employed" }, + "Count_Person_Female": { + "name": "Women", + "statVar": "Count_Person_Female" + }, + "Count_Person_Female_3999249536": { + "facetId": "3999249536", + "name": "Women", + "statVar": "Count_Person_Female" + }, + "Count_Person_HispanicOrLatino_2317674805": { + "facetId": "2317674805", + "name": "Hispanic Population", + "statVar": "Count_Person_HispanicOrLatino" + }, + "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "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" + }, + "Count_Person_HispanicOrLatino_AsianAlone_multiple_place_bar_block": { + "name": "Hispanic Asian Population", + "statVar": "Count_Person_HispanicOrLatino_AsianAlone" + }, + "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block": { + "name": "Hispanic African American Population", + "statVar": "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone" + }, + "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Hispanic Native Hawaiian/Other Pacific Islander Population. Monoracial/Multiracial", + "statVar": "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block": { + "name": "Hispanic Native Hawaiian/Other Pacific Islander Alone Population", + "statVar": "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone" + }, + "Count_Person_HispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block": { + "name": "Hispanic Multiracial Population", + "statVar": "Count_Person_HispanicOrLatino_TwoOrMoreRaces" + }, + "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "White Hispanic Population, Monoracial/Multiracial", + "statVar": "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_HispanicOrLatino_WhiteAlone_multiple_place_bar_block": { + "name": "White Hispanic Monoracial Population", + "statVar": "Count_Person_HispanicOrLatino_WhiteAlone" + }, "Count_Person_InLaborForce": { "name": "Population in the Labor Force", "statVar": "Count_Person_InLaborForce" @@ -321,6 +1121,73 @@ "name": "Population in the Labor Force", "statVar": "Count_Person_InLaborForce" }, + "Count_Person_Male": { + "name": "Men", + "statVar": "Count_Person_Male" + }, + "Count_Person_Male_3999249536": { + "facetId": "3999249536", + "name": "Men", + "statVar": "Count_Person_Male" + }, + "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881": { + "facetId": "3935616881", + "name": "Native Hawaiian and Other Pacific Islander Population, Monoracial/Multiracial", + "statVar": "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "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" + }, + "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Asian", + "statVar": "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_AsianAlone_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Asian Alone", + "statVar": "Count_Person_NotHispanicOrLatino_AsianAlone" + }, + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Black or African American", + "statVar": "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Black or African American Alone", + "statVar": "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone" + }, + "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Native Hawaiian and Other Pacific Islander", + "statVar": "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Native Hawaiian or Other Pacific Islander Alone", + "statVar": "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone" + }, + "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block": { + "name": "Non Hispanic Multiracial Population", + "statVar": "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces" + }, + "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic White Population, Monoracial/Multiracial", + "statVar": "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_PerArea": { + "name": "Population Density", + "statVar": "Count_Person_PerArea" + }, + "Count_Person_PerArea_1151455814": { + "facetId": "1151455814", + "name": "Population Density", + "statVar": "Count_Person_PerArea" + }, "Count_Person_ResidesInHousehold": { "name": "Population: Household", "statVar": "Count_Person_ResidesInHousehold" @@ -348,6 +1215,28 @@ "name": "Population Living in Urban Areas", "statVar": "Count_Person_Urban" }, + "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" + }, + "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881": { + "facetId": "3935616881", + "name": "White Population, Monoracial/Multiracial", + "statVar": "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_WhiteAlone_3935616881": { + "facetId": "3935616881", + "name": "White Monoracial Population", + "statVar": "Count_Person_WhiteAlone" + }, "GrowthRate_Count_Person": { "name": "Rate of Population Growth", "statVar": "GrowthRate_Count_Person" @@ -795,9 +1684,45 @@ ], "exploreMore": { "Count_Person": { + "gender": [ + "Count_Person_Female", + "Count_Person_Male" + ], "placeOfResidenceClassification": [ "Count_Person_Rural", "Count_Person_Urban" + ], + "race": [ + "Count_Person_AmericanIndianAndAlaskaNativeAlone", + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_AsianAlone", + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_BlackOrAfricanAmericanAlone", + "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_HispanicOrLatino", + "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone", + "Count_Person_HispanicOrLatino_AsianAlone", + "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone", + "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone", + "Count_Person_HispanicOrLatino_TwoOrMoreRaces", + "Count_Person_HispanicOrLatino_WhiteAlone", + "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone", + "Count_Person_NotHispanicOrLatino_AsianAlone", + "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone", + "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces", + "Count_Person_WhiteAlone", + "Count_Person_WhiteAloneNotHispanicOrLatino", + "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces" ] } }, diff --git a/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhasemploymentinhospitalitychangedovertimeinnewjerseycounties/chart_config.json b/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhasemploymentinhospitalitychangedovertimeinnewjerseycounties/chart_config.json index 605e422760..4b01d93255 100644 --- a/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhasemploymentinhospitalitychangedovertimeinnewjerseycounties/chart_config.json +++ b/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhasemploymentinhospitalitychangedovertimeinnewjerseycounties/chart_config.json @@ -13,17 +13,17 @@ "geoId/34025", "geoId/34003", "geoId/34017", - "geoId/34029", "geoId/34013", + "geoId/34029", "geoId/34027", "geoId/34023", "geoId/34015", "geoId/34035", "geoId/34005", "geoId/34031", - "geoId/34009", "geoId/34021", "geoId/34007", + "geoId/34009", "geoId/34039", "geoId/34037", "geoId/34019", @@ -85,11 +85,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34029", + "placeDcidOverride": "geoId/34013", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Ocean County", + "title": "Essex County", "type": "LINE" } ] @@ -97,11 +97,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34013", + "placeDcidOverride": "geoId/34029", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Essex County", + "title": "Ocean County", "type": "LINE" } ] @@ -181,11 +181,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34009", + "placeDcidOverride": "geoId/34021", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Cape May County", + "title": "Mercer County", "type": "LINE" } ] @@ -193,11 +193,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34021", + "placeDcidOverride": "geoId/34007", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Mercer County", + "title": "Camden County", "type": "LINE" } ] @@ -205,11 +205,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34007", + "placeDcidOverride": "geoId/34009", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Camden County", + "title": "Cape May County", "type": "LINE" } ] @@ -343,11 +343,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34025", + "placeDcidOverride": "geoId/34035", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Monmouth County", + "title": "Somerset County", "type": "LINE" } ] @@ -355,11 +355,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34035", + "placeDcidOverride": "geoId/34025", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Somerset County", + "title": "Monmouth County", "type": "LINE" } ] @@ -367,11 +367,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34019", + "placeDcidOverride": "geoId/34037", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Hunterdon County", + "title": "Sussex County", "type": "LINE" } ] @@ -379,11 +379,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34037", + "placeDcidOverride": "geoId/34019", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Sussex County", + "title": "Hunterdon County", "type": "LINE" } ] @@ -403,11 +403,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34031", + "placeDcidOverride": "geoId/34013", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Passaic County", + "title": "Essex County", "type": "LINE" } ] @@ -415,11 +415,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34009", + "placeDcidOverride": "geoId/34003", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Cape May County", + "title": "Bergen County", "type": "LINE" } ] @@ -427,11 +427,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34003", + "placeDcidOverride": "geoId/34031", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Bergen County", + "title": "Passaic County", "type": "LINE" } ] @@ -439,11 +439,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34013", + "placeDcidOverride": "geoId/34009", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Essex County", + "title": "Cape May County", "type": "LINE" } ] @@ -463,11 +463,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34011", + "placeDcidOverride": "geoId/34005", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Cumberland County", + "title": "Burlington County", "type": "LINE" } ] @@ -475,11 +475,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34005", + "placeDcidOverride": "geoId/34011", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Burlington County", + "title": "Cumberland County", "type": "LINE" } ] @@ -661,11 +661,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34019", + "placeDcidOverride": "geoId/34037", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Hunterdon County", + "title": "Sussex County", "type": "LINE" } ] @@ -673,11 +673,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34037", + "placeDcidOverride": "geoId/34013", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Sussex County", + "title": "Essex County", "type": "LINE" } ] @@ -685,11 +685,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34021", + "placeDcidOverride": "geoId/34019", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Mercer County", + "title": "Hunterdon County", "type": "LINE" } ] @@ -697,11 +697,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34013", + "placeDcidOverride": "geoId/34021", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Essex County", + "title": "Mercer County", "type": "LINE" } ] @@ -745,11 +745,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34011", + "placeDcidOverride": "geoId/34007", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Cumberland County", + "title": "Camden County", "type": "LINE" } ] @@ -757,11 +757,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34007", + "placeDcidOverride": "geoId/34011", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Camden County", + "title": "Cumberland County", "type": "LINE" } ] diff --git a/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhaslifeexpectancychangedovertimeacrossusstates/chart_config.json b/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhaslifeexpectancychangedovertimeacrossusstates/chart_config.json index 398bb3b8f3..1eed7020a4 100644 --- a/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhaslifeexpectancychangedovertimeacrossusstates/chart_config.json +++ b/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhaslifeexpectancychangedovertimeacrossusstates/chart_config.json @@ -11,56 +11,56 @@ { "comparisonPlaces": [ "geoId/11", + "geoId/06", + "geoId/36", "geoId/15", "geoId/53", + "geoId/51", "geoId/41", - "geoId/16", "geoId/33", - "geoId/51", - "geoId/23", "geoId/25", - "geoId/49", - "geoId/13", "geoId/50", - "geoId/44", - "geoId/42", - "geoId/37", - "geoId/30", + "geoId/32", + "geoId/34", + "geoId/24", + "geoId/13", "geoId/10", - "geoId/08", + "geoId/17", "geoId/02", - "geoId/32", - "geoId/06", - "geoId/40", + "geoId/44", "geoId/12", - "geoId/56", + "geoId/37", + "geoId/16", + "geoId/09", + "geoId/23", + "geoId/42", "geoId/48", + "geoId/08", "geoId/27", - "geoId/24", - "geoId/31", "geoId/45", "geoId/26", - "geoId/19", - "geoId/17", - "geoId/05", - "geoId/01", + "geoId/49", "geoId/55", - "geoId/20", - "geoId/09", + "geoId/31", + "geoId/30", + "geoId/19", + "geoId/04", + "geoId/56", + "geoId/22", + "geoId/39", "geoId/29", + "geoId/46", + "geoId/20", + "geoId/18", + "geoId/01", "geoId/47", - "geoId/39", - "geoId/21", + "geoId/05", "geoId/38", - "geoId/18", - "geoId/54", - "geoId/22", - "geoId/46", - "geoId/36", - "geoId/34", + "geoId/21", + "geoId/40", "geoId/28", - "geoId/04", - "geoId/35" + "geoId/35", + "geoId/54" ], "statVarKey": [ "LifeExpectancy_Person51" @@ -90,11 +90,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/15", + "placeDcidOverride": "geoId/06", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Hawaii", + "title": "California", "type": "LINE" } ] @@ -102,11 +102,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/53", + "placeDcidOverride": "geoId/36", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Washington", + "title": "New York", "type": "LINE" } ] @@ -114,11 +114,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/41", + "placeDcidOverride": "geoId/15", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Oregon", + "title": "Hawaii", "type": "LINE" } ] @@ -126,11 +126,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/16", + "placeDcidOverride": "geoId/53", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Idaho", + "title": "Washington", "type": "LINE" } ] @@ -138,11 +138,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/33", + "placeDcidOverride": "geoId/51", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "New Hampshire", + "title": "Virginia", "type": "LINE" } ] @@ -150,11 +150,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/51", + "placeDcidOverride": "geoId/41", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Virginia", + "title": "Oregon", "type": "LINE" } ] @@ -162,11 +162,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/23", + "placeDcidOverride": "geoId/33", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Maine", + "title": "New Hampshire", "type": "LINE" } ] @@ -186,11 +186,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/49", + "placeDcidOverride": "geoId/50", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Utah", + "title": "Vermont", "type": "LINE" } ] @@ -198,11 +198,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/13", + "placeDcidOverride": "geoId/32", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Georgia", + "title": "Nevada", "type": "LINE" } ] @@ -210,11 +210,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/50", + "placeDcidOverride": "geoId/34", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Vermont", + "title": "New Jersey", "type": "LINE" } ] @@ -222,11 +222,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/44", + "placeDcidOverride": "geoId/24", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Rhode Island", + "title": "Maryland", "type": "LINE" } ] @@ -234,11 +234,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/42", + "placeDcidOverride": "geoId/13", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Pennsylvania", + "title": "Georgia", "type": "LINE" } ] @@ -246,11 +246,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/37", + "placeDcidOverride": "geoId/10", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "North Carolina", + "title": "Delaware", "type": "LINE" } ] @@ -258,11 +258,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/30", + "placeDcidOverride": "geoId/17", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Montana", + "title": "Illinois", "type": "LINE" } ] @@ -270,11 +270,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/10", + "placeDcidOverride": "geoId/02", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Delaware", + "title": "Alaska", "type": "LINE" } ] @@ -282,11 +282,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/08", + "placeDcidOverride": "geoId/44", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Colorado", + "title": "Rhode Island", "type": "LINE" } ] @@ -294,11 +294,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/02", + "placeDcidOverride": "geoId/12", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Alaska", + "title": "Florida", "type": "LINE" } ] @@ -306,11 +306,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/32", + "placeDcidOverride": "geoId/37", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Nevada", + "title": "North Carolina", "type": "LINE" } ] @@ -318,11 +318,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/06", + "placeDcidOverride": "geoId/16", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "California", + "title": "Idaho", "type": "LINE" } ] @@ -330,11 +330,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/40", + "placeDcidOverride": "geoId/09", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Oklahoma", + "title": "Connecticut", "type": "LINE" } ] @@ -342,11 +342,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/12", + "placeDcidOverride": "geoId/23", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Florida", + "title": "Maine", "type": "LINE" } ] @@ -354,11 +354,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/56", + "placeDcidOverride": "geoId/42", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Wyoming", + "title": "Pennsylvania", "type": "LINE" } ] @@ -378,11 +378,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/27", + "placeDcidOverride": "geoId/08", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Minnesota", + "title": "Colorado", "type": "LINE" } ] @@ -390,11 +390,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/24", + "placeDcidOverride": "geoId/27", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Maryland", + "title": "Minnesota", "type": "LINE" } ] @@ -402,11 +402,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/31", + "placeDcidOverride": "geoId/45", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Nebraska", + "title": "South Carolina", "type": "LINE" } ] @@ -414,11 +414,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/45", + "placeDcidOverride": "geoId/26", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "South Carolina", + "title": "Michigan", "type": "LINE" } ] @@ -426,11 +426,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/26", + "placeDcidOverride": "geoId/49", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Michigan", + "title": "Utah", "type": "LINE" } ] @@ -438,11 +438,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/19", + "placeDcidOverride": "geoId/55", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Iowa", + "title": "Wisconsin", "type": "LINE" } ] @@ -450,11 +450,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/17", + "placeDcidOverride": "geoId/31", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Illinois", + "title": "Nebraska", "type": "LINE" } ] @@ -462,11 +462,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/05", + "placeDcidOverride": "geoId/30", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Arkansas", + "title": "Montana", "type": "LINE" } ] @@ -474,11 +474,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/01", + "placeDcidOverride": "geoId/19", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Alabama", + "title": "Iowa", "type": "LINE" } ] @@ -486,11 +486,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/55", + "placeDcidOverride": "geoId/04", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Wisconsin", + "title": "Arizona", "type": "LINE" } ] @@ -498,11 +498,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/20", + "placeDcidOverride": "geoId/56", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Kansas", + "title": "Wyoming", "type": "LINE" } ] @@ -510,11 +510,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/09", + "placeDcidOverride": "geoId/22", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Connecticut", + "title": "Louisiana", "type": "LINE" } ] @@ -522,11 +522,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/29", + "placeDcidOverride": "geoId/39", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Missouri", + "title": "Ohio", "type": "LINE" } ] @@ -534,11 +534,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/47", + "placeDcidOverride": "geoId/29", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Tennessee", + "title": "Missouri", "type": "LINE" } ] @@ -546,11 +546,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/39", + "placeDcidOverride": "geoId/46", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Ohio", + "title": "South Dakota", "type": "LINE" } ] @@ -558,11 +558,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/21", + "placeDcidOverride": "geoId/20", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Kentucky", + "title": "Kansas", "type": "LINE" } ] @@ -570,11 +570,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/38", + "placeDcidOverride": "geoId/18", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "North Dakota", + "title": "Indiana", "type": "LINE" } ] @@ -582,11 +582,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/18", + "placeDcidOverride": "geoId/01", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Indiana", + "title": "Alabama", "type": "LINE" } ] @@ -594,11 +594,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/54", + "placeDcidOverride": "geoId/47", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "West Virginia", + "title": "Tennessee", "type": "LINE" } ] @@ -606,11 +606,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/22", + "placeDcidOverride": "geoId/05", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Louisiana", + "title": "Arkansas", "type": "LINE" } ] @@ -618,11 +618,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/46", + "placeDcidOverride": "geoId/38", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "South Dakota", + "title": "North Dakota", "type": "LINE" } ] @@ -630,11 +630,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/36", + "placeDcidOverride": "geoId/21", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "New York", + "title": "Kentucky", "type": "LINE" } ] @@ -642,11 +642,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34", + "placeDcidOverride": "geoId/40", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "New Jersey", + "title": "Oklahoma", "type": "LINE" } ] @@ -666,11 +666,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/04", + "placeDcidOverride": "geoId/35", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Arizona", + "title": "New Mexico", "type": "LINE" } ] @@ -678,11 +678,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/35", + "placeDcidOverride": "geoId/54", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "New Mexico", + "title": "West Virginia", "type": "LINE" } ] @@ -707,11 +707,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/15", + "placeDcidOverride": "geoId/06", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Hawaii", + "title": "California", "type": "LINE" } ] @@ -719,11 +719,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/53", + "placeDcidOverride": "geoId/36", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Washington", + "title": "New York", "type": "LINE" } ] @@ -731,11 +731,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/41", + "placeDcidOverride": "geoId/15", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Oregon", + "title": "Hawaii", "type": "LINE" } ] @@ -743,11 +743,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/16", + "placeDcidOverride": "geoId/51", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Idaho", + "title": "Virginia", "type": "LINE" } ] @@ -755,11 +755,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/33", + "placeDcidOverride": "geoId/53", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "New Hampshire", + "title": "Washington", "type": "LINE" } ] @@ -767,11 +767,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/23", + "placeDcidOverride": "geoId/41", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Maine", + "title": "Oregon", "type": "LINE" } ] @@ -779,11 +779,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/51", + "placeDcidOverride": "geoId/33", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Virginia", + "title": "New Hampshire", "type": "LINE" } ] @@ -803,11 +803,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/49", + "placeDcidOverride": "geoId/50", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Utah", + "title": "Vermont", "type": "LINE" } ] @@ -815,11 +815,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/13", + "placeDcidOverride": "geoId/32", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Georgia", + "title": "Nevada", "type": "LINE" } ] @@ -827,11 +827,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/50", + "placeDcidOverride": "geoId/34", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Vermont", + "title": "New Jersey", "type": "LINE" } ] @@ -839,11 +839,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/08", + "placeDcidOverride": "geoId/13", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Colorado", + "title": "Georgia", "type": "LINE" } ] @@ -851,11 +851,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/44", + "placeDcidOverride": "geoId/24", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Rhode Island", + "title": "Maryland", "type": "LINE" } ] @@ -863,11 +863,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/42", + "placeDcidOverride": "geoId/10", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Pennsylvania", + "title": "Delaware", "type": "LINE" } ] @@ -875,11 +875,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/30", + "placeDcidOverride": "geoId/17", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Montana", + "title": "Illinois", "type": "LINE" } ] @@ -887,11 +887,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/10", + "placeDcidOverride": "geoId/02", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Delaware", + "title": "Alaska", "type": "LINE" } ] @@ -899,11 +899,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/02", + "placeDcidOverride": "geoId/12", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Alaska", + "title": "Florida", "type": "LINE" } ] @@ -923,11 +923,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/06", + "placeDcidOverride": "geoId/44", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "California", + "title": "Rhode Island", "type": "LINE" } ] @@ -935,11 +935,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/32", + "placeDcidOverride": "geoId/16", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Nevada", + "title": "Idaho", "type": "LINE" } ] @@ -947,11 +947,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/40", + "placeDcidOverride": "geoId/09", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Oklahoma", + "title": "Connecticut", "type": "LINE" } ] @@ -959,11 +959,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/12", + "placeDcidOverride": "geoId/23", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Florida", + "title": "Maine", "type": "LINE" } ] @@ -971,11 +971,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/27", + "placeDcidOverride": "geoId/42", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Minnesota", + "title": "Pennsylvania", "type": "LINE" } ] @@ -983,11 +983,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/24", + "placeDcidOverride": "geoId/48", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Maryland", + "title": "Texas", "type": "LINE" } ] @@ -995,11 +995,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/48", + "placeDcidOverride": "geoId/45", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Texas", + "title": "South Carolina", "type": "LINE" } ] @@ -1007,11 +1007,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/56", + "placeDcidOverride": "geoId/08", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Wyoming", + "title": "Colorado", "type": "LINE" } ] @@ -1019,11 +1019,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/31", + "placeDcidOverride": "geoId/27", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Nebraska", + "title": "Minnesota", "type": "LINE" } ] @@ -1031,11 +1031,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/19", + "placeDcidOverride": "geoId/26", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Iowa", + "title": "Michigan", "type": "LINE" } ] @@ -1043,11 +1043,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/17", + "placeDcidOverride": "geoId/49", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Illinois", + "title": "Utah", "type": "LINE" } ] @@ -1055,11 +1055,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/26", + "placeDcidOverride": "geoId/55", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Michigan", + "title": "Wisconsin", "type": "LINE" } ] @@ -1067,11 +1067,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/45", + "placeDcidOverride": "geoId/31", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "South Carolina", + "title": "Nebraska", "type": "LINE" } ] @@ -1079,11 +1079,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/55", + "placeDcidOverride": "geoId/30", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Wisconsin", + "title": "Montana", "type": "LINE" } ] @@ -1091,11 +1091,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/05", + "placeDcidOverride": "geoId/19", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Arkansas", + "title": "Iowa", "type": "LINE" } ] @@ -1103,11 +1103,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/01", + "placeDcidOverride": "geoId/04", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Alabama", + "title": "Arizona", "type": "LINE" } ] @@ -1115,11 +1115,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/20", + "placeDcidOverride": "geoId/56", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Kansas", + "title": "Wyoming", "type": "LINE" } ] @@ -1127,11 +1127,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/09", + "placeDcidOverride": "geoId/22", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Connecticut", + "title": "Louisiana", "type": "LINE" } ] @@ -1139,11 +1139,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/29", + "placeDcidOverride": "geoId/39", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Missouri", + "title": "Ohio", "type": "LINE" } ] @@ -1151,11 +1151,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/39", + "placeDcidOverride": "geoId/29", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Ohio", + "title": "Missouri", "type": "LINE" } ] @@ -1163,11 +1163,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/38", + "placeDcidOverride": "geoId/46", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "North Dakota", + "title": "South Dakota", "type": "LINE" } ] @@ -1175,11 +1175,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/47", + "placeDcidOverride": "geoId/20", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Tennessee", + "title": "Kansas", "type": "LINE" } ] @@ -1187,11 +1187,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/21", + "placeDcidOverride": "geoId/18", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Kentucky", + "title": "Indiana", "type": "LINE" } ] @@ -1199,11 +1199,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/18", + "placeDcidOverride": "geoId/01", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Indiana", + "title": "Alabama", "type": "LINE" } ] @@ -1211,11 +1211,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/22", + "placeDcidOverride": "geoId/47", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Louisiana", + "title": "Tennessee", "type": "LINE" } ] @@ -1223,11 +1223,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/54", + "placeDcidOverride": "geoId/05", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "West Virginia", + "title": "Arkansas", "type": "LINE" } ] @@ -1235,11 +1235,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/36", + "placeDcidOverride": "geoId/38", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "New York", + "title": "North Dakota", "type": "LINE" } ] @@ -1247,11 +1247,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34", + "placeDcidOverride": "geoId/21", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "New Jersey", + "title": "Kentucky", "type": "LINE" } ] @@ -1259,11 +1259,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/46", + "placeDcidOverride": "geoId/40", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "South Dakota", + "title": "Oklahoma", "type": "LINE" } ] @@ -1283,11 +1283,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/04", + "placeDcidOverride": "geoId/35", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Arizona", + "title": "New Mexico", "type": "LINE" } ] @@ -1295,11 +1295,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/35", + "placeDcidOverride": "geoId/54", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "New Mexico", + "title": "West Virginia", "type": "LINE" } ] 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 98bc57c6b6..68ae66e253 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 @@ -144,6 +144,38 @@ ], "title": "Life Expectancy by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in Administrative Area 1 Places of China (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in Administrative Area 1 Places of China (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths in Administrative Area 1 Places of China" + }, { "columns": [ { From efeff28b5bfced8abc36557784aeda5c5c268d24 Mon Sep 17 00:00:00 2001 From: Jennifer Chen Date: Mon, 21 Oct 2024 13:09:26 -0700 Subject: [PATCH 2/4] fix --- .../detection_api_basic/chart_config.json | 16 ++++++++++++++-- .../detection_api_sdg_idx/chart_config.json | 6 +++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/server/integration_tests/test_data/detection_api_basic/chart_config.json b/server/integration_tests/test_data/detection_api_basic/chart_config.json index 12ec8162dd..d2337fa97a 100644 --- a/server/integration_tests/test_data/detection_api_basic/chart_config.json +++ b/server/integration_tests/test_data/detection_api_basic/chart_config.json @@ -1,6 +1,10 @@ { "childEntityType": "", - "classifications": [], + "classifications": [ + { + "type": 100 + } + ], "client": "test_detect", "comparisonEntities": [], "comparisonVariables": [], @@ -13,5 +17,13 @@ "properties": [], "sessionId": "007_999999999", "test": "unittest", - "variables": [] + "variables": [ + "dc/topic/CommuteTime", + "dc/topic/WorkCommute", + "dc/topic/CommuteMode", + "dc/topic/CommuteModeByOccupation", + "Mean_CommuteTime_Person_Years16Onwards_WorkCommute_Employed_WorkedOutsideOfHome", + "dc/hbkh95kc7pkb6", + "dc/wc8q05drd74bd" + ] } \ No newline at end of file diff --git a/server/integration_tests/test_data/detection_api_sdg_idx/chart_config.json b/server/integration_tests/test_data/detection_api_sdg_idx/chart_config.json index 2daf1a9f30..160f8d4439 100644 --- a/server/integration_tests/test_data/detection_api_sdg_idx/chart_config.json +++ b/server/integration_tests/test_data/detection_api_sdg_idx/chart_config.json @@ -1,6 +1,10 @@ { "childEntityType": "", - "classifications": [], + "classifications": [ + { + "type": 100 + } + ], "client": "test_detect", "comparisonEntities": [], "comparisonVariables": [], From 930157e664f304b1d61d25148fc9731f3b2e3546 Mon Sep 17 00:00:00 2001 From: Jennifer Chen Date: Mon, 21 Oct 2024 13:18:18 -0700 Subject: [PATCH 3/4] pull changes from pr 4679 --- .../webdriver/shared_tests/download_test.py | 12 +++++++---- server/webdriver/shared_tests/map_test.py | 6 +++--- .../shared_tests/place_explorer_test.py | 9 ++++----- server/webdriver/shared_tests/scatter_test.py | 7 +++---- server/webdriver/shared_tests/vis_map_test.py | 20 +++++++++---------- .../shared_tests/vis_scatter_test.py | 20 +++++++------------ 6 files changed, 35 insertions(+), 39 deletions(-) diff --git a/server/webdriver/shared_tests/download_test.py b/server/webdriver/shared_tests/download_test.py index df34f66a97..12950025ff 100644 --- a/server/webdriver/shared_tests/download_test.py +++ b/server/webdriver/shared_tests/download_test.py @@ -23,15 +23,18 @@ DOWNLOAD_URL = '/tools/download' PLACE_SEARCH_CA = 'California' +SKIP_CHECK = 'SKIP_CHECK' TABLE_HEADERS = [ 'placeDcid', 'placeName', 'Date:Median_Age_Person', 'Value:Median_Age_Person', 'Source:Median_Age_Person', 'Date:Count_Person', 'Value:Count_Person', 'Source:Count_Person' ] +# SKIP_CHECK for the values that change with each import. TABLE_ROW_1 = [ - 'geoId/06001', 'Alameda County', '2022', '38.4', + 'geoId/06001', 'Alameda County', SKIP_CHECK, SKIP_CHECK, 'https://www.census.gov/programs-surveys/acs/data/data-via-ftp.html', - '2022', '1628997', 'https://www2.census.gov/programs-surveys/popest/tables' + SKIP_CHECK, SKIP_CHECK, + 'https://www2.census.gov/programs-surveys/popest/tables' ] MAX_NUM_FILE_CHECK_TRIES = 3 @@ -145,7 +148,8 @@ def test_manually_enter_options(self): self.assertGreater(len(table_rows), 1) first_row_cells = table_rows[0].find_elements(By.TAG_NAME, 'td') for idx, cell in enumerate(first_row_cells): - self.assertEqual(cell.text, TABLE_ROW_1[idx]) + if SKIP_CHECK not in TABLE_ROW_1[idx]: + self.assertEqual(cell.text, TABLE_ROW_1[idx]) # Click download self.driver.find_element(By.XPATH, @@ -160,4 +164,4 @@ def test_manually_enter_options(self): if len(downloaded_files) > 0: break num_tries += 1 - self.assertEqual(downloaded_files[0], "California_County.csv") + self.assertEqual(downloaded_files[0], "California_County.csv") \ No newline at end of file diff --git a/server/webdriver/shared_tests/map_test.py b/server/webdriver/shared_tests/map_test.py index b061950f1e..d9790f89d3 100644 --- a/server/webdriver/shared_tests/map_test.py +++ b/server/webdriver/shared_tests/map_test.py @@ -61,7 +61,7 @@ def test_charts_from_url(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart_title = self.driver.find_element( By.XPATH, '//*[@id="map-chart"]/div/div[1]/h3') - self.assertEqual(chart_title.text, "Median Age of Population (2022)") + self.assertIn("Median Age of Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 58) @@ -95,7 +95,7 @@ def test_charts_from_url(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart_title = self.driver.find_element( By.XPATH, '//*[@id="map-chart"]/div/div[1]/h3') - self.assertEqual(chart_title.text, "Median Age of Population (2022)") + self.assertIn("Median Age of Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 52) @@ -161,7 +161,7 @@ def test_manually_enter_options(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart_title = self.driver.find_element( By.XPATH, '//*[@id="map-chart"]/div/div[1]/h3') - self.assertEqual(chart_title.text, "Median Age of Population (2022)") + self.assertIn("Median Age of Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 58) diff --git a/server/webdriver/shared_tests/place_explorer_test.py b/server/webdriver/shared_tests/place_explorer_test.py index 9484bff058..617e649d50 100644 --- a/server/webdriver/shared_tests/place_explorer_test.py +++ b/server/webdriver/shared_tests/place_explorer_test.py @@ -160,7 +160,7 @@ def test_place_search(self): def test_demographics_link(self): """Test the demographics link can work correctly.""" - chart_title = "Median age by gender: states near California(2022)" + title_text = "Median age by gender: states near California" # Load California page. self.driver.get(self.url_ + CA_URL) @@ -187,7 +187,7 @@ def test_demographics_link(self): By.XPATH, '//*[@id="main-pane"]/section[4]/div/div[2]/div/h4').text # Assert chart title is correct. - self.assertEqual(chart_title, chart_title) + self.assertIn(title_text, chart_title) def test_demographics_redirect_link(self): """Test a place page with demographics after a redirect.""" @@ -210,8 +210,7 @@ def test_demographics_redirect_link(self): By.XPATH, '//*[@id="main-pane"]/section[4]/div/div[2]/div/h4').text # Assert chart title is correct. - self.assertEqual("Median age by gender: states near California(2022)", - chart_title) + self.assertIn("Median age by gender: states near California", chart_title) def test_explorer_redirect_place_explorer(self): """Test the redirection from explore to place explore for single place queries""" @@ -331,4 +330,4 @@ def test_ranking_chart_redirect_link(self): # Check the title text page_title = self.driver.find_element(By.ID, 'place-name').text - self.assertEqual(page_title, place_name_text) + self.assertEqual(page_title, place_name_text) \ No newline at end of file diff --git a/server/webdriver/shared_tests/scatter_test.py b/server/webdriver/shared_tests/scatter_test.py index 47a7752466..af217182b5 100644 --- a/server/webdriver/shared_tests/scatter_test.py +++ b/server/webdriver/shared_tests/scatter_test.py @@ -65,9 +65,8 @@ def test_charts_from_url(self): By.XPATH, '//*[@id="chart"]/div[1]/div[1]/h3[1]') chart_title_x = self.driver.find_element( By.XPATH, '//*[@id="chart"]/div[1]/div[1]/h3[2]') - self.assertEqual(chart_title_y.text, - "Population Asian Alone Per Capita (2022)") - self.assertEqual(chart_title_x.text, "Median Income of a Population (2022)") + self.assertIn("Population Asian Alone Per Capita ", chart_title_y.text) + self.assertIn("Median Income of a Population ", chart_title_x.text) chart = self.driver.find_element(By.XPATH, '//*[@id="scatterplot"]') circles = chart.find_elements(By.TAG_NAME, 'circle') self.assertGreater(len(circles), 20) @@ -157,4 +156,4 @@ def test_landing_page_link(self): shared.wait_for_loading(self.driver) chart = self.driver.find_element(By.XPATH, '//*[@id="scatterplot"]') circles = chart.find_elements(By.TAG_NAME, 'circle') - self.assertGreater(len(circles), 1) + self.assertGreater(len(circles), 1) \ No newline at end of file diff --git a/server/webdriver/shared_tests/vis_map_test.py b/server/webdriver/shared_tests/vis_map_test.py index edcf740d31..cfb82fac55 100644 --- a/server/webdriver/shared_tests/vis_map_test.py +++ b/server/webdriver/shared_tests/vis_map_test.py @@ -79,7 +79,7 @@ def test_charts_from_url(self): # Assert chart is correct. chart_title = self.driver.find_element(By.CSS_SELECTOR, '.map-chart .chart-headers h4') - self.assertEqual(chart_title.text, "Female Population (2022)") + self.assertIn("Female Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 58) @@ -93,8 +93,8 @@ def test_charts_from_url(self): ranking_items = self.driver.find_elements(By.CSS_SELECTOR, '.ranking-list .place-name') self.assertEqual(len(ranking_items), 10) - self.assertEqual(ranking_items[0].text, 'Los Angeles County, CA') - self.assertEqual(ranking_items[9].text, 'Trinity County, CA') + self.assertIn(' County, CA', ranking_items[0].text) + self.assertIn(' County, CA', ranking_items[9].text) # Click per capita and assert results are correct. per_capita_checkbox = self.driver.find_element( @@ -110,8 +110,8 @@ def test_charts_from_url(self): ranking_items = self.driver.find_elements(By.CSS_SELECTOR, '.ranking-list .place-name') self.assertEqual(len(ranking_items), 10) - self.assertEqual(ranking_items[0].text, 'Alpine County, CA') - self.assertEqual(ranking_items[9].text, 'Del Norte County, CA') + self.assertIn(' County, CA', ranking_items[0].text) + self.assertIn(' County, CA', ranking_items[9].text) # Edit source and assert results are correct. edit_source_button = self.driver.find_element( @@ -128,7 +128,7 @@ def test_charts_from_url(self): shared.wait_for_loading(self.driver) chart_title = self.driver.find_element(By.CSS_SELECTOR, '.map-chart .chart-headers h4') - self.assertEqual(chart_title.text, "Female Population (2004 to 2020)") + self.assertIn("Female Population ", chart_title.text) chart_source = self.driver.find_element( By.CSS_SELECTOR, '.map-chart .chart-headers .sources') self.assertTrue("wonder.cdc.gov" in chart_source.text) @@ -138,8 +138,8 @@ def test_charts_from_url(self): ranking_items = self.driver.find_elements(By.CSS_SELECTOR, '.ranking-list .place-name') self.assertEqual(len(ranking_items), 10) - self.assertEqual(ranking_items[0].text, 'Madera County, CA') - self.assertEqual(ranking_items[9].text, 'Tuolumne County, CA') + self.assertIn(' County, CA', ranking_items[0].text) + self.assertIn(' County, CA', ranking_items[9].text) def test_manually_enter_options(self): """Test entering place and stat var options manually will cause chart to @@ -209,7 +209,7 @@ def test_manually_enter_options(self): shared.wait_for_loading(self.driver) chart_title = self.driver.find_element(By.CSS_SELECTOR, '.map-chart .chart-headers h4') - self.assertEqual(chart_title.text, "Median Age of Population (2022)") + self.assertIn("Median Age of Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 58) @@ -243,4 +243,4 @@ def test_landing_page_link(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') - self.assertGreater(len(map_regions), 1) + self.assertGreater(len(map_regions), 1) \ No newline at end of file diff --git a/server/webdriver/shared_tests/vis_scatter_test.py b/server/webdriver/shared_tests/vis_scatter_test.py index 4e91dc46b6..6f2b953cce 100644 --- a/server/webdriver/shared_tests/vis_scatter_test.py +++ b/server/webdriver/shared_tests/vis_scatter_test.py @@ -81,10 +81,8 @@ def test_charts_from_url(self): # Assert chart is correct. chart_title = self.driver.find_element(By.CSS_SELECTOR, '.scatter-chart .chart-headers h4') - self.assertEqual( - chart_title.text, - "Population Without Health Insurance (2022) vs Female Population (2022)" - ) + self.assertIn("Population Without Health Insurance ", chart_title.text) + self.assertIn(" vs Female Population ", chart_title.text) chart = self.driver.find_element(By.ID, 'scatterplot') circles = chart.find_elements(By.TAG_NAME, 'circle') self.assertGreater(len(circles), 20) @@ -138,10 +136,8 @@ def test_charts_from_url(self): # Check that results are correct chart_title = self.driver.find_element(By.CSS_SELECTOR, '.scatter-chart .chart-headers h4') - self.assertEqual( - chart_title.text, - "Population Without Health Insurance (2022) vs Female Population (2004 to 2020)" - ) + self.assertIn("Population Without Health Insurance ", chart_title.text) + self.assertIn(" vs Female Population ", chart_title.text) chart_source = self.driver.find_element( By.CSS_SELECTOR, '.scatter-chart .chart-headers .sources') self.assertTrue("wonder.cdc.gov" in chart_source.text) @@ -234,10 +230,8 @@ def test_manually_enter_options(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(shared.charts_rendered) chart_title = self.driver.find_element(By.CSS_SELECTOR, '.scatter-chart .chart-headers h4') - self.assertEqual( - chart_title.text, - 'Median Age of Population (2022) vs Median Income of a Population (2022)' - ) + self.assertIn("Median Age of Population ", chart_title.text) + self.assertIn(" vs Median Income of a Population ", chart_title.text) chart = self.driver.find_element(By.ID, 'scatterplot') circles = chart.find_elements(By.TAG_NAME, 'circle') self.assertGreater(len(circles), 20) @@ -258,4 +252,4 @@ def test_landing_page_link(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart = self.driver.find_element(By.ID, 'scatterplot') circles = chart.find_elements(By.TAG_NAME, 'circle') - self.assertGreater(len(circles), 20) + self.assertGreater(len(circles), 20) \ No newline at end of file From ceb31db2973fbf0c918793368e8db468cc7e23d5 Mon Sep 17 00:00:00 2001 From: Jennifer Chen Date: Mon, 21 Oct 2024 13:36:14 -0700 Subject: [PATCH 4/4] update --- .../whatisthephylumofvolvox/debug_info.json | 143 +++++++++++++++--- .../debug_info.json | 12 +- .../debug_info.json | 4 +- .../debug_info.json | 8 +- 4 files changed, 133 insertions(+), 34 deletions(-) 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 a199fa8511..046cbf177a 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 @@ -3,18 +3,126 @@ "places_resolved": "", "main_place_dcid": "", "main_place_name": "", - "entities_detected": [], - "entities_resolved": "", - "query_with_places_removed": "", + "entities_detected": [ + "volvox" + ], + "entities_resolved": "(name: Volvox, dcid: bio/D044446); ", + "query_with_places_removed": "what is the phylum of", "sv_matching": { - "CosineScore": [], + "CosineScore": [ + 0.35510891675949097, + 0.34608712792396545, + 0.34525778889656067, + 0.34484589099884033, + 0.3411365747451782, + 0.3384982645511627, + 0.3349902927875519, + 0.33166080713272095, + 0.32600581645965576, + 0.32424452900886536, + 0.32060614228248596, + 0.3142656087875366, + 0.31276530027389526, + 0.3126294016838074, + 0.31250450015068054, + 0.31177398562431335, + 0.31033891439437866, + 0.3100748062133789, + 0.3098834156990051, + 0.30805402994155884, + 0.3074587285518646, + 0.30719631910324097, + 0.3039420545101166 + ], "MultiSV": {}, - "Query": "What is the phylum of volvox", - "SV": [] + "Query": "what is the phylum of", + "SV": [ + "dc/topic/SDGBiodiversity", + "Count_Person_5OrMoreYears_OtherIndicLanguagesSpokenAtHome", + "Annual_Amount_Emissions_Phenol_SCC_28_MiscellaneousAreaSources", + "Annual_Amount_Emissions_Phenol_SCC_3_IndustrialProcesses", + "Annual_Amount_Emissions_Phenol_SCC_26_WasteDisposalTreatmentAndRecovery", + "Count_Person_5OrMoreYears_GreekSpokenAtHome", + "Annual_Amount_Emissions_Phenol_SCC_23_IndustrialProcesses", + "Amount_FarmInventory_SorghumForSilageOrGreenchop", + "Count_Person_5OrMoreYears_PersianInclFarsiDariSpokenAtHome", + "Count_Person_SpeakEnglishLessThanVeryWell_5OrMoreYears_PersianSpokenAtHome", + "Count_Farm_SorghumForSilageOrGreenchop", + "Annual_Amount_Emissions_Phenol_SCC_22_MobileSources", + "Count_Person_SpeakEnglishLessThanVeryWell_5OrMoreYears_PersianInclFarsiDariSpokenAtHome", + "Amount_FarmInventory_BarleyForGrain", + "Count_Person_5OrMoreYears_OtherAndUnspecifiedLanguagesSpokenAtHome", + "Count_Person_5OrMoreYears_MalayalamKannadaOrOtherDravidianLanguagesSpokenAtHome", + "Amount_FarmInventory_DurumWheatForGrain", + "Count_Person_SpeakEnglishVeryWell_5OrMoreYears_PersianInclFarsiDariSpokenAtHome", + "Count_Person_SpeakEnglishVeryWell_5OrMoreYears_MalayalamKannadaOrOtherDravidianLanguagesSpokenAtHome", + "Count_Person_SpeakEnglishVeryWell_5OrMoreYears_GreekSpokenAtHome", + "Annual_Amount_Emissions_Phenol_SCC_2_InternalCombustionEngines", + "Amount_FarmInventory_CornForSilageOrGreenchop", + "Count_Person_5OrMoreYears_OtherSlavicLanguagesSpokenAtHome" + ] }, "props_matching": { - "CosineScore": [], - "PROP": [] + "CosineScore": [ + 1.0000001192092896, + 0.47528403997421265, + 0.3615415692329407, + 0.3420097827911377, + 0.32933083176612854, + 0.3184516429901123, + 0.3146698474884033, + 0.3083950877189636, + 0.30794060230255127, + 0.3046301305294037, + 0.2827085256576538, + 0.2818753123283386, + 0.28082767128944397, + 0.28045278787612915, + 0.2742983102798462, + 0.2715049386024475, + 0.27071818709373474, + 0.2695465385913849, + 0.25990062952041626, + 0.25990062952041626, + 0.24827902019023895, + 0.24662014842033386, + 0.24632105231285095, + 0.24616341292858124, + 0.24212220311164856, + 0.23135532438755035, + 0.2296244204044342, + 0.2277354896068573 + ], + "PROP": [ + "phylum", + "chemblID", + "geneID", + "virusGenus", + "typeOfGene", + "fullName", + "ensemblID", + "simplifiedMolecularInputLineEntrySystem", + "geneticVariantFunctionalCategory", + "imageUrl", + "genomicCoordinates", + "chromosomeSize", + "observedAllele", + "hg38GenomicPosition", + "hg19GenomicPosition", + "virusHost", + "strandOrientation", + "ncbiDNASequenceName", + "<-geneSymbol{typeOf:GeneticVariantGeneAssociation}->referenceSNPClusterID", + "<-referenceSNPClusterID{typeOf:GeneticVariantGeneAssociation}->geneSymbol", + "ncbiProteinAccessionNumber", + "alleleType", + "hg38GenomicLocation", + "ofVirusSpecies", + "hg19GenomicLocation", + "ncbiTaxonID", + "antigenType", + "alleleOrigin" + ] }, "query_detection_debug_logs": { "dc_recognize_entities": { @@ -23,29 +131,20 @@ ] }, "dc_recognize_places": {}, - "llm_response": { - "COMPARE": null, - "COMPARISON_FILTER": [], - "DISASTER_EVENT": null, - "GROWTH": null, - "METRICS": [], - "PLACES": [], - "RANK": null, - "RANKING_FILTER": [], - "SUB_PLACE_TYPE": null, - "SUPERLATIVE": null, - "UNSAFE": false - }, "main_place_inferred": null, "original_query": "What is the phylum of volvox", "place_dcid_inference": "Place DCID Inference did not trigger (no place strings found).", "place_resolution": "Place resolution did not trigger (no place dcids found).", "places_found_str": [], "query_transformations": { + "place_detection_input": "What is the phylum of volvox", + "place_detection_with_places_removed": "what is the phylum of", "sv_detection_query_index_types": [ "medium_ft", "bio_ft" - ] + ], + "sv_detection_query_input": "what is the phylum of", + "sv_detection_query_stop_words_removal": "phylum" } } } \ 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 75945a07f5..4611fc3e24 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.9257858991622925 + 0.9257857799530029 ], "QueryPart": "male population", "SV": [ @@ -63,8 +63,8 @@ }, { "CosineScore": [ - 0.9296979904174805, - 0.8847434520721436 + 0.92969810962677, + 0.884743332862854 ], "QueryPart": "female population", "SV": [ @@ -80,7 +80,7 @@ "Parts": [ { "CosineScore": [ - 0.911777138710022 + 0.9117770791053772 ], "QueryPart": "male population female", "SV": [ @@ -89,8 +89,8 @@ }, { "CosineScore": [ - 0.8982377648353577, - 0.8723466396331787 + 0.8982378840446472, + 0.8723467588424683 ], "QueryPart": "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 cde42a4ae2..e015ba346e 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 @@ -45,7 +45,7 @@ "Parts": [ { "CosineScore": [ - 0.7997788786888123 + 0.7997788190841675 ], "QueryPart": "factors like obesity blood pressure asthma impacted", "SV": [ @@ -86,7 +86,7 @@ }, { "CosineScore": [ - 0.9999995827674866 + 0.9999996423721313 ], "QueryPart": "blood pressure", "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 ff1a8fda0b..e0c5938a14 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 @@ -41,7 +41,7 @@ "Parts": [ { "CosineScore": [ - 0.8787486553192139 + 0.8787487149238586 ], "QueryPart": "show climate change", "SV": [ @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999998211860657 + 0.9999998807907104 ], "QueryPart": "drought", "SV": [ @@ -66,7 +66,7 @@ { "CosineScore": [ 0.794236958026886, - 0.7929013967514038 + 0.792901337146759 ], "QueryPart": "show climate", "SV": [ @@ -76,7 +76,7 @@ }, { "CosineScore": [ - 0.866512656211853 + 0.8665127754211426 ], "QueryPart": "change drought", "SV": [