Skip to content

Commit

Permalink
NL: fix a few bugs (#2945)
Browse files Browse the repository at this point in the history 
1. Bug in extend_svs where we don't always check SV compatibility caused
#2938

<img width="400" alt="Screenshot 2023-07-13 at 7 54 21 PM"
src="https://github.com/datacommonsorg/website/assets/4375037/7ffd67c0-ca2e-4a60-b61d-7cd71be08511">

3. Fix #2932 by limiting
the number of extended SVs we plot in a bar chart to 16, and also keep
the "main SV" pinned as the first entry so its clear.

<img width="400" alt="Screenshot 2023-07-13 at 7 52 53 PM"
src="https://github.com/datacommonsorg/website/assets/4375037/017defe3-2759-46af-8e92-6f3c373aa61c">

5. Fix #2925 by ensuring
that contained-in doesn't match substrings
  • Loading branch information
@pradh
pradh committed Jul 14, 2023
1 parent 65d4c73 commit bddec6f
Show file tree
Hide file tree
Showing 13 changed files with 140 additions and 90 deletions.
6 changes: 3 additions & 3 deletions server/integration_tests/test_data/demo2_cities_feb2023/query_2/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
"geoId/0677000"
],
"statVarKey": [
"Percent_Person_WithAsthma_multiple_place_bar_block",
"Percent_Person_WithAllTeethLoss_multiple_place_bar_block",
"Percent_Person_WithArthritis_multiple_place_bar_block",
"Percent_Person_WithAsthma_multiple_place_bar_block",
"Percent_Person_WithCancerExcludingSkinCancer_multiple_place_bar_block",
"Percent_Person_WithChronicKidneyDisease_multiple_place_bar_block",
"Percent_Person_WithChronicObstructivePulmonaryDisease_multiple_place_bar_block",
Expand All @@ -99,11 +99,11 @@
"tiles": [
{
"statVarKey": [
"Percent_Person_Smoking",
"Percent_Person_BingeDrinking",
"Percent_Person_Obesity",
"Percent_Person_PhysicalInactivity",
"Percent_Person_SleepLessThan7Hours",
"Percent_Person_Smoking"
"Percent_Person_SleepLessThan7Hours"
],
"title": "Percentage of Population That Smokes compared with other variables in Sunnyvale",
"type": "LINE"
Expand Down
4 changes: 2 additions & 2 deletions server/integration_tests/test_data/demo_fallback/query_3/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@
"geoId/06"
],
"statVarKey": [
"Count_CriminalActivities_PropertyCrime_multiple_place_bar_block",
"Count_CriminalActivities_AggravatedAssault_multiple_place_bar_block",
"Count_CriminalActivities_Burglary_multiple_place_bar_block",
"Count_CriminalActivities_ForcibleRape_multiple_place_bar_block",
"Count_CriminalActivities_LarcenyTheft_multiple_place_bar_block",
"Count_CriminalActivities_MotorVehicleTheft_multiple_place_bar_block",
"Count_CriminalActivities_PropertyCrime_multiple_place_bar_block",
"Count_CriminalActivities_Robbery_multiple_place_bar_block",
"Count_CriminalActivities_ViolentCrime_multiple_place_bar_block"
],
Expand All @@ -227,12 +227,12 @@
"geoId/06"
],
"statVarKey": [
"Count_CriminalActivities_PropertyCrime_multiple_place_bar_block_pc",
"Count_CriminalActivities_AggravatedAssault_multiple_place_bar_block_pc",
"Count_CriminalActivities_Burglary_multiple_place_bar_block_pc",
"Count_CriminalActivities_ForcibleRape_multiple_place_bar_block_pc",
"Count_CriminalActivities_LarcenyTheft_multiple_place_bar_block_pc",
"Count_CriminalActivities_MotorVehicleTheft_multiple_place_bar_block_pc",
"Count_CriminalActivities_PropertyCrime_multiple_place_bar_block_pc",
"Count_CriminalActivities_Robbery_multiple_place_bar_block_pc",
"Count_CriminalActivities_ViolentCrime_multiple_place_bar_block_pc"
],
Expand Down
4 changes: 2 additions & 2 deletions server/integration_tests/test_data/demo_fallback/query_4/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
"country/USA"
],
"statVarKey": [
"Percent_Person_BingeDrinking_multiple_place_bar_block",
"Percent_Person_Obesity_multiple_place_bar_block",
"Percent_Person_BingeDrinking_multiple_place_bar_block",
"Percent_Person_PhysicalInactivity_multiple_place_bar_block",
"Percent_Person_SleepLessThan7Hours_multiple_place_bar_block",
"Percent_Person_Smoking_multiple_place_bar_block"
Expand All @@ -70,6 +70,7 @@
"country/USA"
],
"statVarKey": [
"Percent_Person_WithPhysicalHealthNotGood_multiple_place_bar_block",
"Percent_Person_WithArthritis_multiple_place_bar_block",
"Percent_Person_WithAsthma_multiple_place_bar_block",
"Percent_Person_WithCancerExcludingSkinCancer_multiple_place_bar_block",
Expand All @@ -80,7 +81,6 @@
"Percent_Person_WithHighBloodPressure_multiple_place_bar_block",
"Percent_Person_WithHighCholesterol_multiple_place_bar_block",
"Percent_Person_WithMentalHealthNotGood_multiple_place_bar_block",
"Percent_Person_WithPhysicalHealthNotGood_multiple_place_bar_block",
"Percent_Person_WithStroke_multiple_place_bar_block"
],
"title": "Physical Health Issues compared with other variables in United States (${date})",
Expand Down
5 changes: 1 addition & 4 deletions server/integration_tests/test_data/demo_fallback/query_5/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,17 +245,14 @@
{
"statVarKey": [
"Amount_EconomicActivity_GrossDomesticProduction_Nominal",
"Amount_EconomicActivity_GrossDomesticProduction_Nominal_PerCapita",
"Amount_EconomicActivity_GrossDomesticProduction_RealValue",
"GrowthRate_Amount_EconomicActivity_GrossDomesticProduction"
"Amount_EconomicActivity_GrossDomesticProduction_RealValue"
],
"title": "GDP (Nominal Value) compared with other variables in United States",
"type": "LINE"
},
{
"statVarKey": [
"Amount_EconomicActivity_GrossDomesticProduction_Nominal_pc",
"Amount_EconomicActivity_GrossDomesticProduction_Nominal_PerCapita_pc",
"Amount_EconomicActivity_GrossDomesticProduction_RealValue_pc"
],
"title": "Per Capita GDP (Nominal Value) compared with other variables in United States",
Expand Down
Loading

0 comments on commit bddec6f

Please sign in to comment.