feat: split cases/death data source

Author: sgratzl

src/modes/data-anomalies/AnnotationTable.svelte

@@ -3,12 +3,28 @@
   import SortColumnIndicator from '../mobile/components/SortColumnIndicator.svelte';
   import { SortHelper } from '../mobile/components/tableUtils';
   import ExternalLinkIcon from '!raw-loader!@fortawesome/fontawesome-free/svgs/solid/external-link-alt.svg';
-  import { getDataSource, CASES_DEATH_SOURCE } from '../../stores/dataSourceLookup';
+  import { getDataSource, CASES_SOURCE, DEATH_SOURCE } from '../../stores/dataSourceLookup';
   import { formatDateISO } from '../../formats';
   import chevronRightIcon from '!raw-loader!@fortawesome/fontawesome-free/svgs/solid/chevron-right.svg';
   import { getInfoByName } from '../../maps';
   import { isCasesSignal, isDeathSignal } from '../../data';
 
+  /**
+   * @param {import ('../../data/annotations').Annotation} d
+   */
+  function resolveDataSource(d) {
+    if (d.source !== 'indicator-combination') {
+      return getDataSource(d.source);
+    }
+    const signals = [...d.signals];
+    if (signals.every((d) => isCasesSignal(d))) {
+      return getDataSource(CASES_SOURCE);
+    }
+    if (signals.every((d) => isDeathSignal(d))) {
+      return getDataSource(DEATH_SOURCE);
+    }
+    return getDataSource(d.source);
+  }
   /**
    *
    * @param {import ('../../data/annotations').Annotation} d
@@ -19,10 +35,7 @@
       annotation: d,
       problem: d.problem,
       // in case just of cases/death replace with custom data source name
-      source:
-        [...d.signals].every((s) => isCasesSignal(s) || isDeathSignal(s)) && d.source === 'indicator-combination'
-          ? getDataSource(CASES_DEATH_SOURCE)
-          : getDataSource(d.source),
+      source: resolveDataSource(d),
       reference: d.reference,
       dateRange: `${formatDateISO(d.dates[0])} - ${formatDateISO(d.dates[1])}`,
     };

src/modes/mobile/IndicatorTable.svelte

@@ -4,7 +4,6 @@
   import { SensorParam } from '../../stores/params';
   import { formatDateISO, formatDateShortNumbers } from '../../formats';
   import filterIcon from '!raw-loader!@fortawesome/fontawesome-free/svgs/solid/filter.svg';
-  import { CASES_DEATH_SOURCE } from '../../stores/dataSourceLookup';
   import { currentMode } from '../../stores';
   import { modeByID } from '..';
   import TrendIndicator from './TrendIndicator.svelte';
@@ -38,7 +37,7 @@
         e.sensors.push(sensor);
       } else {
         map.set(ds, {
-          name: sensor.isCasesOrDeath ? CASES_DEATH_SOURCE : sensor.id,
+          name: ds,
           label: ds,
           sensors: [sensor],
         });
@@ -58,12 +57,7 @@
   }
 
   function matchDataSource(sensor, selected) {
-    return (
-      selected === '' ||
-      selected === 'all' ||
-      (sensor.isCasesOrDeath && selected === CASES_DEATH_SOURCE) ||
-      (!sensor.isCasesOrDeath && sensor.value.id === selected)
-    );
+    return selected === '' || selected === 'all' || sensor.dataSourceName === selected;
   }
   /**
    * @param {import("../../stores/params").SensorParam} sensor

src/stores/dataSourceLookup.js

@@ -1,14 +1,16 @@
 import { isCasesSignal, isDeathSignal } from '../data/signals';
 
-export const CASES_DEATH_SOURCE = 'cases-deaths';
+export const CASES_SOURCE = 'cases';
+export const DEATH_SOURCE = 'deaths';
 
 const sourceNameLookup = {
   chng: 'Change Healthcare',
   'doctor-visits': 'Doctor Visits',
   'fb-survey': 'Delphi Pandemic Survey via Facebook',
   ght: 'Google Search Trends',
   'hospital-admissions': 'Hospital Admissions',
-  [CASES_DEATH_SOURCE]: 'Public Health Reports',
+  [CASES_SOURCE]: 'COVID Cases',
+  [DEATH_SOURCE]: 'COVID Deaths',
   'indicator-combination': 'COVID Indicator Combination',
   quidel: 'Quidel Antigen Tests',
   safegraph: 'SafeGraph Mobility Data',
@@ -22,8 +24,11 @@ export function getDataSource(sensor) {
   if (typeof sensor === 'string') {
     return sourceNameLookup[sensor] || sensor;
   }
-  if (isCasesSignal(sensor.signal) || isDeathSignal(sensor.signal)) {
-    return sourceNameLookup[CASES_DEATH_SOURCE];
+  if (isCasesSignal(sensor.signal)) {
+    return sourceNameLookup[CASES_SOURCE];
+  }
+  if (isDeathSignal(sensor.signal)) {
+    return sourceNameLookup[DEATH_SOURCE];
   }
   return sourceNameLookup[sensor.id] || sensor.id;
 }

src/stores/params.js

@@ -628,6 +628,7 @@ export class SensorParam {
     this.value = sensor;
     this.rawValue = sensor.rawSensor;
     this.isCasesOrDeath = sensor.isCasesOrDeath || false;
+    this.dataSourceName = sensor.dataSourceName;
     // fractions as percentages here
     this.factor = sensor.format === 'fraction' ? 100 : 1;
     this.isPercentage = sensor.format == 'percent' || sensor.format === 'fraction';