diff --git a/server/integration_tests/test_data/demo_fallback/query_1/chart_config.json b/server/integration_tests/test_data/demo_fallback/query_1/chart_config.json index 62e9a2ba6c..41339e625e 100644 --- a/server/integration_tests/test_data/demo_fallback/query_1/chart_config.json +++ b/server/integration_tests/test_data/demo_fallback/query_1/chart_config.json @@ -31,7 +31,7 @@ "place": { "dcid": "geoId/0667000", "name": "San Francisco", - "place_type": "City" + "place_type": "AdministrativeArea2" }, "placeFallback": {}, "placeSource": "CURRENT_QUERY", @@ -39,7 +39,7 @@ { "dcid": "geoId/0667000", "name": "San Francisco", - "place_type": "City" + "place_type": "AdministrativeArea2" }, { "dcid": "geoId/1714000", diff --git a/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json b/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json index 539f82b410..5b4095c438 100644 --- a/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json +++ b/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json @@ -35,7 +35,7 @@ 0.38543, 0.38534, 0.38184, - 0.37971 + 0.3797 ], "MultiSV": {}, "Query": "what types of genes are and", 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 2d267671b5..0a137dcdc6 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 @@ -32,7 +32,7 @@ 0.63385, 0.63227, 0.63222, - 0.63049, + 0.6305, 0.6303, 0.62984, 0.62957 diff --git a/server/integration_tests/test_data/e2e_date_range/femalepopulationinnewyorkbefore2020/chart_config.json b/server/integration_tests/test_data/e2e_date_range/femalepopulationinnewyorkbefore2020/chart_config.json index 1f6a4f10f2..ed05d7db8d 100644 --- a/server/integration_tests/test_data/e2e_date_range/femalepopulationinnewyorkbefore2020/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/femalepopulationinnewyorkbefore2020/chart_config.json @@ -15,7 +15,7 @@ "statVarKey": [ "Count_Person_Female_1145703171" ], - "title": "Women in New York", + "title": "Women in New York City", "type": "LINE" } ] @@ -23,11 +23,11 @@ { "tiles": [ { - "description": "Women in New York", + "description": "Women in New York City", "statVarKey": [ "Count_Person_Female_2019" ], - "title": "Women in New York", + "title": "Women in New York City", "type": "HIGHLIGHT" } ] @@ -49,7 +49,7 @@ "Count_Person_Female_1145703171", "Count_Person_Male_1145703171" ], - "title": "Population by Gender in New York", + "title": "Population by Gender in New York City", "type": "LINE" } ] @@ -69,7 +69,7 @@ "statVarKey": [ "Count_Person_Female_MarriedAndNotSeparated_2369573279" ], - "title": "Non-Separated Married Women in New York", + "title": "Non-Separated Married Women in New York City", "type": "LINE" } ] @@ -77,11 +77,11 @@ { "tiles": [ { - "description": "Non-Separated Married Women in New York", + "description": "Non-Separated Married Women in New York City", "statVarKey": [ "Count_Person_Female_MarriedAndNotSeparated_2019" ], - "title": "Non-Separated Married Women in New York", + "title": "Non-Separated Married Women in New York City", "type": "HIGHLIGHT" } ] @@ -101,7 +101,7 @@ "statVarKey": [ "Count_Person_Female_TwoOrMoreRaces_1145703171" ], - "title": "Women Identifying as Multiracial in New York", + "title": "Women Identifying as Multiracial in New York City", "type": "LINE" } ] @@ -109,11 +109,11 @@ { "tiles": [ { - "description": "Women Identifying as Multiracial in New York", + "description": "Women Identifying as Multiracial in New York City", "statVarKey": [ "Count_Person_Female_TwoOrMoreRaces_2019" ], - "title": "Women Identifying as Multiracial in New York", + "title": "Women Identifying as Multiracial in New York City", "type": "HIGHLIGHT" } ] @@ -133,7 +133,7 @@ "statVarKey": [ "Count_Person_3OrMoreYears_Female_EnrolledInSchool_1145703171" ], - "title": "Population: Female, Enrolled in School in New York", + "title": "Population: Female, Enrolled in School in New York City", "type": "LINE" } ] @@ -141,11 +141,11 @@ { "tiles": [ { - "description": "Population: Female, Enrolled in School in New York", + "description": "Population: Female, Enrolled in School in New York City", "statVarKey": [ "Count_Person_3OrMoreYears_Female_EnrolledInSchool_2019" ], - "title": "Population: Female, Enrolled in School in New York", + "title": "Population: Female, Enrolled in School in New York City", "type": "HIGHLIGHT" } ] @@ -165,7 +165,7 @@ "statVarKey": [ "Count_Person_Female_WithHealthInsurance_1704193675" ], - "title": "Women With Health Insurance in New York", + "title": "Women With Health Insurance in New York City", "type": "LINE" } ] @@ -173,11 +173,11 @@ { "tiles": [ { - "description": "Women With Health Insurance in New York", + "description": "Women With Health Insurance in New York City", "statVarKey": [ "Count_Person_Female_WithHealthInsurance_2019" ], - "title": "Women With Health Insurance in New York", + "title": "Women With Health Insurance in New York City", "type": "HIGHLIGHT" } ] @@ -197,7 +197,7 @@ "statVarKey": [ "Count_Person_Female_FullTimeYearRoundWorker_4208561269" ], - "title": "Population: 16-64 Years, Female, Full Time Year Round Worker in New York", + "title": "Population: 16-64 Years, Female, Full Time Year Round Worker in New York City", "type": "LINE" } ] @@ -205,11 +205,11 @@ { "tiles": [ { - "description": "Population: 16-64 Years, Female, Full Time Year Round Worker in New York", + "description": "Population: 16-64 Years, Female, Full Time Year Round Worker in New York City", "statVarKey": [ "Count_Person_Female_FullTimeYearRoundWorker_2019" ], - "title": "Population: 16-64 Years, Female, Full Time Year Round Worker in New York", + "title": "Population: 16-64 Years, Female, Full Time Year Round Worker in New York City", "type": "HIGHLIGHT" } ] @@ -229,7 +229,7 @@ "statVarKey": [ "Median_Age_Person_Female_3795540742" ], - "title": "Women's Median Age in New York", + "title": "Women's Median Age in New York City", "type": "LINE" } ] @@ -237,11 +237,11 @@ { "tiles": [ { - "description": "Women's Median Age in New York", + "description": "Women's Median Age in New York City", "statVarKey": [ "Median_Age_Person_Female_2019" ], - "title": "Women's Median Age in New York", + "title": "Women's Median Age in New York City", "type": "HIGHLIGHT" } ] @@ -260,7 +260,7 @@ "statVarKey": [ "Count_Person_Female_AsianAlone_1145703171" ], - "title": "Asian Monoracial Women in New York", + "title": "Asian Monoracial Women in New York City", "type": "LINE" } ] @@ -268,11 +268,11 @@ { "tiles": [ { - "description": "Asian Monoracial Women in New York", + "description": "Asian Monoracial Women in New York City", "statVarKey": [ "Count_Person_Female_AsianAlone_2019" ], - "title": "Asian Monoracial Women in New York", + "title": "Asian Monoracial Women in New York City", "type": "HIGHLIGHT" } ] @@ -292,7 +292,7 @@ "statVarKey": [ "Count_Person_Female_WhiteAlone_1145703171" ], - "title": "Women Identifying as White Alone in New York", + "title": "Women Identifying as White Alone in New York City", "type": "LINE" } ] @@ -300,11 +300,11 @@ { "tiles": [ { - "description": "Women Identifying as White Alone in New York", + "description": "Women Identifying as White Alone in New York City", "statVarKey": [ "Count_Person_Female_WhiteAlone_2019" ], - "title": "Women Identifying as White Alone in New York", + "title": "Women Identifying as White Alone in New York City", "type": "HIGHLIGHT" } ] @@ -324,7 +324,7 @@ "statVarKey": [ "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female_1118952551" ], - "title": "Population: Bachelors Degree or Higher, Female in New York", + "title": "Population: Bachelors Degree or Higher, Female in New York City", "type": "LINE" } ] @@ -332,11 +332,11 @@ { "tiles": [ { - "description": "Population: Bachelors Degree or Higher, Female in New York", + "description": "Population: Bachelors Degree or Higher, Female in New York City", "statVarKey": [ "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female_2019" ], - "title": "Population: Bachelors Degree or Higher, Female in New York", + "title": "Population: Bachelors Degree or Higher, Female in New York City", "type": "HIGHLIGHT" } ] @@ -356,7 +356,7 @@ "statVarKey": [ "Count_Person_WithDisability_Female_4281944711" ], - "title": "Women With Disabilities in New York", + "title": "Women With Disabilities in New York City", "type": "LINE" } ] @@ -364,11 +364,11 @@ { "tiles": [ { - "description": "Women With Disabilities in New York", + "description": "Women With Disabilities in New York City", "statVarKey": [ "Count_Person_WithDisability_Female_2019" ], - "title": "Women With Disabilities in New York", + "title": "Women With Disabilities in New York City", "type": "HIGHLIGHT" } ] @@ -388,7 +388,7 @@ "statVarKey": [ "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female_1145703171" ], - "title": "Bachelors, Women in New York", + "title": "Bachelors, Women in New York City", "type": "LINE" } ] @@ -396,11 +396,11 @@ { "tiles": [ { - "description": "Bachelors, Women in New York", + "description": "Bachelors, Women in New York City", "statVarKey": [ "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegree_Female_2019" ], - "title": "Bachelors, Women in New York", + "title": "Bachelors, Women in New York City", "type": "HIGHLIGHT" } ] @@ -420,7 +420,7 @@ "statVarKey": [ "Count_Person_16OrMoreYears_Female_WithEarnings_1472009826" ], - "title": "Population: 16 Years or More, Female, With Earnings in New York", + "title": "Population: 16 Years or More, Female, With Earnings in New York City", "type": "LINE" } ] @@ -428,11 +428,11 @@ { "tiles": [ { - "description": "Population: 16 Years or More, Female, With Earnings in New York", + "description": "Population: 16 Years or More, Female, With Earnings in New York City", "statVarKey": [ "Count_Person_16OrMoreYears_Female_WithEarnings_2019" ], - "title": "Population: 16 Years or More, Female, With Earnings in New York", + "title": "Population: 16 Years or More, Female, With Earnings in New York City", "type": "HIGHLIGHT" } ] @@ -452,7 +452,7 @@ "statVarKey": [ "Count_Person_85OrMoreYears_Female_1145703171" ], - "title": "Women Over 85 in New York", + "title": "Women Over 85 in New York City", "type": "LINE" } ] @@ -460,11 +460,11 @@ { "tiles": [ { - "description": "Women Over 85 in New York", + "description": "Women Over 85 in New York City", "statVarKey": [ "Count_Person_85OrMoreYears_Female_2019" ], - "title": "Women Over 85 in New York", + "title": "Women Over 85 in New York City", "type": "HIGHLIGHT" } ] @@ -635,7 +635,7 @@ "pastSourceContext": "", "place": { "dcid": "geoId/3651000", - "name": "New York", + "name": "New York City", "place_type": "City" }, "placeFallback": {}, @@ -643,7 +643,7 @@ "places": [ { "dcid": "geoId/3651000", - "name": "New York", + "name": "New York City", "place_type": "City" } ], diff --git a/server/integration_tests/test_data/place_detection_e2e_dc/query_5/chart_config.json b/server/integration_tests/test_data/place_detection_e2e_dc/query_5/chart_config.json index 7e0a982276..f8fe853316 100644 --- a/server/integration_tests/test_data/place_detection_e2e_dc/query_5/chart_config.json +++ b/server/integration_tests/test_data/place_detection_e2e_dc/query_5/chart_config.json @@ -33,6 +33,27 @@ "description": "The total number of people in a population.", "title": "Population" }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person" + ], + "title": "Population in Administrative Area 2 Places of Mexico City (${date})", + "type": "RANKING" + } + ] + } + ], + "description": "The total number of people in a population.", + "title": "Population in Administrative Area 2 Places of Mexico City" + }, { "columns": [ { @@ -145,6 +166,48 @@ "denom": "Count_Person", "title": "Population 85 or Over by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Female" + ], + "title": "Women Over 85 in Administrative Area 2 Places of Mexico City (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population 85 or Over by Gender in Administrative Area 2 Places of Mexico City" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Male" + ], + "title": "Men Over 85 in Administrative Area 2 Places of Mexico City (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population 85 or Over by Gender in Administrative Area 2 Places of Mexico City" + }, { "columns": [ { @@ -163,6 +226,48 @@ "denom": "Count_Person", "title": "Population by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Female" + ], + "title": "Women in Administrative Area 2 Places of Mexico City (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population by Gender in Administrative Area 2 Places of Mexico City" + }, + { + "columns": [ + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Male" + ], + "title": "Men in Administrative Area 2 Places of Mexico City (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population by Gender in Administrative Area 2 Places of Mexico City" + }, { "columns": [ { @@ -230,10 +335,18 @@ "name": "Population", "statVar": "Count_Person" }, + "Count_Person_85OrMoreYears_Female": { + "name": "Women over 85", + "statVar": "Count_Person_85OrMoreYears_Female" + }, "Count_Person_85OrMoreYears_Female_multiple_place_bar_block": { "name": "Women over 85", "statVar": "Count_Person_85OrMoreYears_Female" }, + "Count_Person_85OrMoreYears_Male": { + "name": "Men over 85", + "statVar": "Count_Person_85OrMoreYears_Male" + }, "Count_Person_85OrMoreYears_Male_multiple_place_bar_block": { "name": "Men over 85", "statVar": "Count_Person_85OrMoreYears_Male" @@ -266,6 +379,9 @@ } ], "metadata": { + "containedPlaceTypes": { + "AdministrativeArea1": "AdministrativeArea2" + }, "placeDcid": [ "wikidataId/Q1489" ] @@ -278,7 +394,7 @@ "place": { "dcid": "wikidataId/Q1489", "name": "Mexico City", - "place_type": "City" + "place_type": "AdministrativeArea1" }, "placeFallback": {}, "placeSource": "CURRENT_QUERY", @@ -286,11 +402,126 @@ { "dcid": "wikidataId/Q1489", "name": "Mexico City", - "place_type": "City" + "place_type": "AdministrativeArea1" } ], "relatedThings": { - "childPlaces": {}, + "childPlaces": { + "AdministrativeArea2": [ + { + "dcid": "wikidataId/Q10832464", + "name": "Venustiano Carranza", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q14906254", + "name": "\u00c1lvaro Obreg\u00f3n", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q1832732", + "name": "Miguel Hidalgo", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q2027082", + "name": "Gustavo A. Madero", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q2356998", + "name": "Benito Ju\u00e1rez de Ochoa Quiroz", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q408181", + "name": "Tl\u00e1huac", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q408187", + "name": "Tlalpan", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q643026", + "name": "Xochimilco", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q645293", + "name": "Cuauht\u00e9moc", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q661315", + "name": "Coyoac\u00e1n", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q741771", + "name": "Iztapalapa", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q762749", + "name": "Cuajimalpa", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q780038", + "name": "La Magdalena Contreras", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q936087", + "name": "Milpa Alta", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q953866", + "name": "Tlalpan", + "types": [ + "AdministrativeArea2" + ] + }, + { + "dcid": "wikidataId/Q994867", + "name": "Azcapotzalco", + "types": [ + "AdministrativeArea2" + ] + } + ] + }, "childTopics": [ { "dcid": "dc/topic/Age", @@ -347,113 +578,7 @@ ] } ], - "peerPlaces": [ - { - "dcid": "wikidataId/Q956", - "name": "Beijing", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "nuts/DE3", - "name": "Berlin", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q85", - "name": "Cairo", - "types": [ - "City" - ] - }, - { - "dcid": "geoId/1714000", - "name": "Chicago", - "types": [ - "City" - ] - }, - { - "dcid": "wikidataId/Q1353", - "name": "Delhi", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "wikidataId/Q34647", - "name": "Johannesburg", - "types": [ - "City" - ] - }, - { - "dcid": "wikidataId/Q84", - "name": "London", - "types": [ - "City" - ] - }, - { - "dcid": "wikidataId/Q2807", - "name": "Madrid", - "types": [ - "AdministrativeArea3" - ] - }, - { - "dcid": "wikidataId/Q649", - "name": "Moscow", - "types": [ - "AdministrativeArea1" - ] - }, - { - "dcid": "geoId/3651000", - "name": "New York", - "types": [ - "City" - ] - }, - { - "dcid": "nuts/FR101", - "name": "Paris", - "types": [ - "AdministrativeArea2" - ] - }, - { - "dcid": "wikidataId/Q8678", - "name": "Rio de Janeiro", - "types": [ - "AdministrativeArea2" - ] - }, - { - "dcid": "geoId/0667000", - "name": "San Francisco", - "types": [ - "AdministrativeArea2" - ] - }, - { - "dcid": "wikidataId/Q3130", - "name": "Sydney", - "types": [ - "City" - ] - }, - { - "dcid": "wikidataId/Q7473516", - "name": "Tokyo", - "types": [ - "City" - ] - } - ], + "peerPlaces": [], "peerTopics": [ { "dcid": "dc/topic/Health",