Merge pull request #1140 from cmu-delphi/sgratzl/quidel-raw-hint

Quidel Raw Hint

Author: sgratzl

src/blocks/HistoryLineChart.svelte

@@ -274,7 +274,15 @@
 
   $: raw = singleRaw && sensor.rawValue != null && !($isMobileDevice && showFull);
   $: regions = raw ? [region.value] : resolveRegions(region.value, singleRegionOnly, showNeighbors);
-  $: annotations = $annotationManager.getWindowAnnotations(sensor.value, regions, timeFrame.min, timeFrame.max, true);
+  $: annotations = raw
+    ? $annotationManager.getMultiWindowAnnotations(
+        [sensor.value, sensor.rawValue],
+        regions,
+        timeFrame.min,
+        timeFrame.max,
+        true,
+      )
+    : $annotationManager.getWindowAnnotations(sensor.value, regions, timeFrame.min, timeFrame.max, true);
   $: spec = injectRanges(
     genSpec(sensor, region, date, timeFrame, {
       height,
@@ -286,7 +294,7 @@
       stderr,
     }),
     timeFrame,
-    annotations,
+    annotations.filter((d) => !d.isAllTime),
   );
   $: data = raw
     ? loadSingleData(sensor, region, timeFrame)
@@ -336,7 +344,7 @@
     <Toggle bind:checked={singleRaw}>Raw Data</Toggle>
   {/if}
   {#if !($isMobileDevice && raw)}
-    <Toggle bind:checked={showFull}>Show All Dates</Toggle>
+    <Toggle bind:checked={showFull}>All Dates</Toggle>
   {/if}
   <div class="spacer" />
   <DownloadMenu {fileName} {vegaRef} {data} {sensor} {raw} {stderr} />

src/components/IndicatorAnnotation.svelte

@@ -7,7 +7,7 @@
   export let annotation;
 </script>
 
-<div class="uk-alert uk-alert-{annotation.uncertainty ? 'info' : 'warning'} {className}">
+<div class="uk-alert uk-alert-{annotation.uncertainty || annotation.isAllTime ? 'info' : 'warning'} {className}">
   <h5 class="alert-header">
     <div class="text">
       <span class="inline-svg-icon">
@@ -19,7 +19,9 @@
       </span>
       {annotation.problem}
     </div>
-    <div class="date">{formatDateISO(annotation.dates[0])} - {formatDateISO(annotation.dates[1])}</div>
+    {#if !annotation.isAllTime}
+      <div class="date">{formatDateISO(annotation.dates[0])} - {formatDateISO(annotation.dates[1])}</div>
+    {/if}
   </h5>
   <p class="uk-margin-remove-bottom">
     {annotation.explanation}

src/data/annotations.ts

@@ -19,9 +19,11 @@ function parseSignals(signals: string) {
   );
 }
 
+const ALL_TIME_MIN = new Date(2019, 0, 1);
+
 function parseDates(dates: string): [Date, Date] {
   if (!dates) {
-    return [new Date(), new Date()];
+    return [ALL_TIME_MIN, new Date()];
   }
   if (/^-\d+$/g.test(dates)) {
     const uncertaintyDays = Number.parseInt(dates);
@@ -73,6 +75,7 @@ export class Annotation {
   readonly regions: { level: RegionLevel; ids: '*' | Set<string> }[];
   readonly uncertainty: boolean;
   readonly reference?: string;
+  readonly isAllTime: boolean;
 
   constructor(raw: EpiDataAnomaliesRow) {
     this.source = raw.source.trim();
@@ -83,6 +86,7 @@ export class Annotation {
     this.regions = parseRegions(raw.regions);
     this.reference = raw.reference;
     this.uncertainty = /^-\d+$/g.test(raw.dates);
+    this.isAllTime = !raw.dates;
   }
 
   /**
@@ -191,6 +195,25 @@ export class AnnotationManager {
       .sort(sortByDate);
   }
 
+  getMultiWindowAnnotations(
+    sensors: { id: string; signal: string }[],
+    region: RegionInfo | RegionInfo[],
+    dateStart: Date,
+    dateEnd: Date,
+    includeUncertainty = false,
+  ): Annotation[] {
+    return this.annotations
+      .filter(
+        (d) =>
+          sensors.some((s) => d.matchSensor(s)) &&
+          region != null &&
+          d.matchRegion(region) &&
+          d.inDateRange(dateStart, dateEnd) &&
+          (includeUncertainty || !d.uncertainty),
+      )
+      .sort(sortByDate);
+  }
+
   getWindowLevelAnnotations(
     sensor: { id: string; signal: string },
     level: RegionLevel,