Merge pull request #1149 from cmu-delphi/sgratzl/uncertainty_marker

fix uncertainty hint for multiple regions

Author: sgratzl

src/blocks/HistoryLineChart.svelte

@@ -252,7 +252,7 @@
     }-${sensor.isWeeklySignal ? formatWeek(timeFrame.max_week) : formatDateISO(timeFrame.max)}${suffix}`;
   }
 
-  function injectRanges(spec, timeFrame, annotations) {
+  function injectRanges(spec, timeFrame, annotations, multipleRegions) {
     if (annotations.length > 0) {
       spec.layer.unshift(genAnnotationLayer(annotations, timeFrame));
     }
@@ -264,7 +264,7 @@
     }
     const uncertaintyAnnotation = annotations.find((d) => d.uncertainty);
     if (uncertaintyAnnotation) {
-      spec.layer.push(genUncertaintyLayer(uncertaintyAnnotation, { color }));
+      spec.layer.push(genUncertaintyLayer(uncertaintyAnnotation, { color, multipleRegions }));
     }
     return spec;
   }
@@ -295,6 +295,7 @@
     }),
     timeFrame,
     annotations.filter((d) => !d.isAllTime),
+    regions.length > 1,
   );
   $: data = raw
     ? loadSingleData(sensor, region, timeFrame)

src/specs/lineSpec.ts

@@ -205,9 +205,13 @@ export function genUncertaintyLayer(
   {
     dateField = 'date_value',
     valueField = 'value',
+    compareField = 'displayName',
+    multipleRegions,
   }: {
     dateField?: string;
     valueField?: string;
+    compareField?: string;
+    multipleRegions?: boolean;
   },
 ): NormalizedUnitSpec {
   const start = toTimeValue(annotation.dates[0]);
@@ -234,6 +238,12 @@ export function genUncertaintyLayer(
         field: valueField,
         type: 'quantitative',
       },
+      detail: multipleRegions
+        ? {
+            field: compareField,
+            type: 'nominal',
+          }
+        : undefined,
     },
   };
 }