updated indicators for 1.3 release

rhansolo · rhansolo · commit 7ca41ebfb11e · 2020-06-02T19:11:28.000-04:00
diff --git a/src/App.svelte b/src/App.svelte
@@ -63,11 +63,11 @@
     var data1 = json1.epidata;
     var data2 = json2.epidata;
     for (var i = 0; i < data1.length; i++) {
-      var death_ratio = data1[i].value;
-      var total_daily_death = data2[i].value;
-      data1[i].death_ratio = death_ratio;
+      var ratio = data1[i].value;
+      var count = data2[i].value;
+      data1[i].ratio = ratio;
       delete data1[i].value;
-      data1[i].total_daily_death = total_daily_death;
+      data1[i].count = count;
       new_epidata.push(data1[i]);
     }
     return new_epidata;
@@ -86,14 +86,42 @@
           currentData.set([]);
           regionSliceCache.update(m => m.set(sensor + level + date, []));
         } else {
-          // when displaying deaths, need to disply more info
-          if (sEntry.signal === 'deaths_incidence_prop') {
-            callAPI(sEntry.id, 'deaths_incidence_num', level, date, '*').then(d1 => {
-              var extended = extend(d, d1);
-              currentData.set(extended);
-              regionSliceCache.update(m => m.set(sensor + level + date, extended));
-            });
-          } else {
+          const death_regex = /deaths_incidence_/;
+          const cases_regex = /confirmed_incidence_/;
+          // deaths needs both count and ratio
+          if (sEntry.signal.match(death_regex)) {
+            if (sEntry.signal === 'deaths_incidence_prop') {
+              callAPI(sEntry.id, 'deaths_incidence_num', level, date, '*').then(d1 => {
+                var extended = extend(d, d1);
+                currentData.set(extended);
+                regionSliceCache.update(m => m.set(sensor + level + date, extended));
+              });
+            } else {
+              callAPI(sEntry.id, 'deaths_incidence_prop', level, date, '*').then(d1 => {
+                var extended = extend(d, d1);
+                currentData.set(extended);
+                regionSliceCache.update(m => m.set(sensor + level + date, extended));
+              });
+            }
+          }
+          // cases needs both count and ratio
+          else if (sEntry.signal.match(cases_regex)) {
+            if (sEntry.signal === 'confirmed_incidence_prop') {
+              callAPI(sEntry.id, 'confirmed_incidence_num', level, date, '*').then(d1 => {
+                var extended = extend(d, d1);
+                currentData.set(extended);
+                regionSliceCache.update(m => m.set(sensor + level + date, extended));
+              });
+            } else {
+              callAPI(sEntry.id, 'confirmed_incidence_prop', level, date, '*').then(d1 => {
+                var extended = extend(d, d1);
+                currentData.set(extended);
+                regionSliceCache.update(m => m.set(sensor + level + date, extended));
+              });
+            }
+          }
+          // everything else
+          else {
             currentData.set(d.epidata);
             regionSliceCache.update(m => m.set(sensor + level + date, d.epidata));
           }
@@ -232,7 +260,7 @@
               std: matchedMeta.stdev_value,
             });
             // add min/max count for death count
-            if (sEntry.signal === 'deaths_incidence_prop') {
+            if (sEntry.signal.match(/num/)) {
               statsMap.set(sensorKey + '_count', {
                 low: Math.max(matchedMeta.min_value, 1),
                 high: matchedMeta.max_value,
diff --git a/src/Legend.svelte b/src/Legend.svelte
@@ -13,7 +13,7 @@
     let sts;
     let valueMinMax;
 
-    if ($currentSensor === 'jhu-csse-deaths_incidence_prop') {
+    if ($currentSensor.match(/num/)) {
       sts = stats.get(sens + '_count');
       valueMinMax = [sts.low, sts.high];
     } else {
diff --git a/src/MapBox.svelte b/src/MapBox.svelte
@@ -94,14 +94,14 @@
     let body;
     if ($signalType === 'value') {
       // More information displayed when deaths is shown
-      if (sens.name === 'Deaths (JHU)') {
+      if ($currentSensor.match(/deaths_incidence_num/)) {
         const death_num = e.features[0].properties.value;
         const ratio = e.features[0].properties.value1;
         body = `
           <div class="map-popup-region-value-container">
             Population: ${Population} <br>
-            ${sens.yAxis}: ${ratio.toFixed(2)} ${sens.format === 'percent' ? '%' : ''} <br>
-            Deaths:
+            Death per 100,000 people: ${ratio.toFixed(2)} ${sens.format === 'percent' ? '%' : ''} <br>
+            ${sens.yAxis}:
             <span class="map-popup-region-value" 
                   style="background-color: ${fillColor}; 
                         color: ${getTextColorBasedOnBackground(fillColor)};">
@@ -110,6 +110,54 @@
             
           </div>
         `;
+      } else if ($currentSensor.match(/deaths_incidence_prop/)) {
+        const death_num = e.features[0].properties.value;
+        const ratio = e.features[0].properties.value1;
+        body = `
+          <div class="map-popup-region-value-container">
+            Population: ${Population} <br>
+            Deaths: ${death_num} <br>
+            ${sens.yAxis}:
+            <span class="map-popup-region-value" 
+                  style="background-color: ${fillColor}; 
+                        color: ${getTextColorBasedOnBackground(fillColor)};">
+              ${ratio.toFixed(2)}
+              ${sens.format === 'percent' ? '%' : ''}
+            </span>
+          </div>
+        `;
+      } else if ($currentSensor.match(/confirmed_incidence_num/)) {
+        const cases_num = e.features[0].properties.value;
+        const ratio = e.features[0].properties.value1;
+        body = `
+          <div class="map-popup-region-value-container">
+            Population: ${Population} <br>
+            Cases per 100,000 people: ${ratio.toFixed(2)} ${sens.format === 'percent' ? '%' : ''} <br>
+            ${sens.yAxis}:
+            <span class="map-popup-region-value" 
+                  style="background-color: ${fillColor}; 
+                        color: ${getTextColorBasedOnBackground(fillColor)};">
+              ${cases_num}
+            </span>
+            
+          </div>
+        `;
+      } else if ($currentSensor.match(/confirmed_incidence_prop/)) {
+        const cases_num = e.features[0].properties.value;
+        const ratio = e.features[0].properties.value1;
+        body = `
+          <div class="map-popup-region-value-container">
+            Population: ${Population} <br>
+            Cases: ${cases_num} <br>
+            ${sens.yAxis}:
+            <span class="map-popup-region-value" 
+                  style="background-color: ${fillColor}; 
+                        color: ${getTextColorBasedOnBackground(fillColor)};">
+              ${ratio.toFixed(2)}
+              ${sens.format === 'percent' ? '%' : ''}
+            </span>
+          </div>
+        `;
       } else {
         body = `
           <div class="map-popup-region-value-container">
@@ -246,7 +294,7 @@
     let valueMinMax;
 
     // Customize min max values for deaths
-    if ($sensorMap.get($currentSensor).name === 'Deaths (JHU)') {
+    if ($currentSensor.match(/num/)) {
       thisStats = $stats.get($currentSensor + '_count');
       valueMinMax = [thisStats.low, thisStats.high];
     } else {
@@ -270,9 +318,9 @@
 
         if (d.value !== null) {
           var info = [];
-          if ($sensorMap.get($currentSensor).name === 'Deaths (JHU)') {
-            info.push(d.death_ratio);
-            info.push(d.total_daily_death);
+          if ($currentSensor.match(/prop/) || $currentSensor.match(/num/)) {
+            info.push(d.ratio);
+            info.push(d.count);
           } else {
             info.push(d.value);
           }
@@ -304,7 +352,11 @@
 
         if (geoIds.has(id + '000') && valueMappedMega.get(id) !== undefined) {
           d.properties.value = valueMappedMega.get(id)[0];
-          if ($sensorMap.get($currentSensor).name === 'Deaths (JHU)') {
+
+          if ($currentSensor.match(/num/)) {
+            d.properties.value = valueMappedMega.get(id)[0];
+            d.properties.value1 = valueMappedMega.get(id)[1];
+          } else if ($currentSensor.match(/prop/)) {
             d.properties.value = valueMappedMega.get(id)[1];
             d.properties.value1 = valueMappedMega.get(id)[0];
           }
@@ -324,7 +376,10 @@
 
       if (geoIds.has(id) && valueMappedVals.get(id) !== undefined) {
         d.properties.value = valueMappedVals.get(id)[0];
-        if ($sensorMap.get($currentSensor).name === 'Deaths (JHU)') {
+        if ($currentSensor.match(/num/)) {
+          d.properties.value = valueMappedVals.get(id)[0];
+          d.properties.value1 = valueMappedVals.get(id)[1];
+        } else if ($currentSensor.match(/prop/)) {
           d.properties.value = valueMappedVals.get(id)[1];
           d.properties.value1 = valueMappedVals.get(id)[0];
         }
@@ -338,14 +393,15 @@
     let stopsMega;
     if ($signalType === 'value') {
       let center = valueMinMax[0] + (valueMinMax[1] - valueMinMax[0]) / 2;
-      if ($sensorMap.get($currentSensor).name === 'Deaths (JHU)') {
+      if ($currentSensor.match(/num/)) {
         stops = [
           [0, DIRECTION_THEME.deathMin],
           [valueMinMax[0], DIRECTION_THEME.gradientMin],
           [center, DIRECTION_THEME.gradientMiddle],
           [valueMinMax[1], DIRECTION_THEME.gradientMax],
         ];
         stopsMega = [
+          [0, DIRECTION_THEME.deathMin],
           [valueMinMax[0], DIRECTION_THEME.gradientMinMega],
           [center, DIRECTION_THEME.gradientMiddleMega],
           [valueMinMax[1], DIRECTION_THEME.gradientMaxMega],
diff --git a/src/stores.js b/src/stores.js
@@ -28,6 +28,7 @@ export const sensors = readable(
       signal: 'smoothed_adj_cli',
       levels: ['county', 'msa', 'state'],
       official: false,
+      bolded: false
     },
     {
       name: 'Symptoms (FB)',
@@ -40,7 +41,7 @@ export const sensors = readable(
       signal: 'smoothed_cli',
       levels: ['county', 'msa', 'state'],
       official: false,
-      bolded: false,
+      bolded: false
     },
     {
       name: 'Symptoms in Community (FB)',
@@ -53,7 +54,7 @@ export const sensors = readable(
       signal: 'smoothed_hh_cmnty_cli',
       levels: ['county', 'msa', 'state'],
       official: false,
-      bolded: false,
+      bolded: false
     },
     {
       name: 'Search Trends (Google)',
@@ -66,47 +67,73 @@ export const sensors = readable(
       signal: 'smoothed_search',
       levels: ['msa', 'state'],
       official: false,
-      bolded: false,
+      bolded: false
     },
     {
-      name: 'Combined',
-      id: 'indicator-combination',
+      name: "Combined",
+      id: "indicator-combination",
       tooltipText: 'Combination of COVID-19 indicators available at this geographic level',
       mapTitleText: 'Combination of COVID-19 indicators',
       chartTitleText: 'Combination of COVID-19 indicators',
       yAxis: 'Combined value (arbitrary scale)',
-      format: 'raw',
-      signal: 'nmf_day_doc_fbc_fbs_ght',
-      levels: ['county', 'msa', 'state'],
+      format: "raw",
+      signal: "nmf_day_doc_fbc_fbs_ght",
+      levels: ["county", "msa", "state"],
       official: false,
-      bolded: true,
+      bolded: true
+    },
+    {
+      name: 'Cases',
+      id: 'jhu-csse',
+      tooltipText: 'Daily confirmed COVID-19 cases, as reported by Johns Hopkins University',
+      mapTitleText: 'Daily confirmed COVID-19 cases',
+      chartTitleText: 'Daily confirmed COVID-19 cases',
+      yAxis: 'Cases',
+      format: 'raw',
+      signal: 'confirmed_incidence_num',
+      levels: ['msa', 'county', 'state'],
+      official: true,
+      bolded: false
     },
     {
-      name: 'Cases (JHU)',
+      name: 'Cases per capita',
       id: 'jhu-csse',
-      tooltipText: 'New COVID-19 cases per 100,000 people, as reported by Johns Hopkins University',
-      mapTitleText: 'New confirmed COVID-19 cases per 100,000 people',
-      chartTitleText: 'New confirmed COVID-19 cases per 100,000 people',
+      tooltipText: 'Daily confirmed COVID-19 cases per 100,000 people, based on data reported by Johns Hopkins University',
+      mapTitleText: 'Daily confirmed COVID-19 cases per 100,000 people',
+      chartTitleText: 'Daily confirmed COVID-19 cases per 100,000 people',
       yAxis: 'Cases per 100,000 people',
       format: 'raw',
       signal: 'confirmed_incidence_prop',
       levels: ['msa', 'county', 'state'],
       official: true,
-      bolded: false,
+      bolded: false
     },
     {
-      name: 'Deaths (JHU)',
+      name: 'Deaths',
       id: 'jhu-csse',
-      tooltipText: 'New COVID-19 deaths per 100,000 people, as reported by Johns Hopkins University',
-      mapTitleText: 'New COVID-19 deaths per 100,000 people',
-      chartTitleText: 'New COVID-19 deaths per 100,000 people',
+      tooltipText: 'Daily COVID-19 deaths, as reported by Johns Hopkins University',
+      mapTitleText: 'Daily COVID-19 deaths',
+      chartTitleText: 'Daily COVID-19 deaths',
+      yAxis: 'Deaths',
+      format: 'raw',
+      signal: 'deaths_incidence_num',
+      levels: ['msa', 'county', 'state'],
+      official: true,
+      bolded: false
+    },
+    {
+      name: 'Deaths per capita',
+      id: 'jhu-csse',
+      tooltipText: 'Daily COVID-19 deaths per 100,000 people, based on data reported by Johns Hopkins University',
+      mapTitleText: 'Daily COVID-19 deaths per 100,000 people',
+      chartTitleText: 'Daily COVID-19 deaths per 100,000 people',
       yAxis: 'Deaths per 100,000 people',
       format: 'raw',
       signal: 'deaths_incidence_prop',
       levels: ['msa', 'county', 'state'],
       official: true,
-      bolded: false,
-    },
+      bolded: false
+    }
   ],
   (set) => {
     let sensorsOption = urlParams.get('sensors');
