Merge pull request #1001 from cmu-delphi/sgratzl/neighboring

fix neighbors and disable in survey view

Author: sgratzl

src/blocks/HistoryLineChart.svelte

@@ -59,6 +59,8 @@
 
   export let showAnnotations = true;
 
+  export let showNeighbors = true;
+
   let showFull = expandableWindow === 'full';
 
   /**
@@ -104,7 +106,7 @@
     region,
     date,
     timeFrame,
-    { height, zero, raw, isMobile, singleRegionOnly, domain, cumulative },
+    { height, zero, raw, isMobile, singleRegionOnly, domain, cumulative, showNeighbors },
   ) {
     const isWeekly = sensor.value.isWeeklySignal;
     const options = {
@@ -134,10 +136,11 @@
     if (region.level === 'county') {
       // county vs related vs state vs nation
       const state = getStateOfCounty(region);
-      return generateCompareLineSpec(
-        [region.displayName, neighboringInfo.displayName, state.displayName, nationInfo.displayName],
-        options,
-      );
+      const regions = [region.displayName, state.displayName, nationInfo.displayName];
+      if (showNeighbors) {
+        regions.splice(1, 0, neighboringInfo.displayName);
+      }
+      return generateCompareLineSpec(regions, options);
     }
     if (region.level !== 'nation') {
       return generateCompareLineSpec([region.displayName, nationInfo.displayName], options);
@@ -150,7 +153,7 @@
    * @param {import("../stores/params").DateParam} date
    * @param {import("../stores/params").RegionParam} region
    */
-  function loadData(sensor, region, timeFrame, singleRegionOnly) {
+  function loadData(sensor, region, timeFrame, singleRegionOnly, showNeighbors) {
     if (!region.value) {
       return null;
     }
@@ -163,19 +166,24 @@
     const data = [selfData];
 
     if (region.level === 'county') {
+      if (showNeighbors) {
+        const relatedCounties = getRelatedCounties(region.value);
+        const relatedData = fetcher
+          .fetch1SensorNRegionsNDates(sensor, relatedCounties, timeFrame)
+          .then((r) => averageByDate(r, neighboringInfo))
+          .then((r) => addMissing(r, sensor.isWeeklySignal ? 'week' : 'day'));
+        data.push(relatedData);
+      }
       const state = getStateOfCounty(region);
       const stateData = fetcher.fetch1Sensor1RegionNDates(sensor, state, timeFrame);
-      const relatedCounties = getRelatedCounties(region.value);
-      const relatedData = fetcher
-        .fetch1SensorNRegionsNDates(sensor, relatedCounties, timeFrame)
-        .then((r) => averageByDate(r, sensor, neighboringInfo))
-        .then((r) => addMissing(r, sensor));
-      data.push(relatedData, stateData);
+      data.push(stateData);
     }
     if (region.level !== 'nation') {
       data.push(fetcher.fetch1Sensor1RegionNDates(sensor, nationInfo, timeFrame));
     }
-    return Promise.all(data).then((rows) => rows.reverse().flat());
+    return Promise.all(data).then((rows) => {
+      return rows.reverse().flat();
+    });
   }
 
   /**
@@ -221,14 +229,18 @@
     }
   }
 
-  function resolveRegions(region, singleRegionOnly) {
+  function resolveRegions(region, singleRegionOnly, showNeighbors) {
     if (singleRegionOnly) {
       return [region];
     }
     if (region.level === 'county') {
       // county vs related vs state vs nation
       const state = getStateOfCounty(region);
-      return [region, neighboringInfo, state, nationInfo];
+      const regions = [region, state, nationInfo];
+      if (showNeighbors) {
+        regions.splice(1, 0, neighboringInfo);
+      }
+      return regions;
     }
     if (region.level !== 'nation') {
       // state vs nation
@@ -273,7 +285,7 @@
 
   $: raw = singleRaw && sensor.rawValue != null && !($isMobileDevice && showFull);
   $: cumulative = raw && singleCumulative && sensor.rawCumulativeValue != null;
-  $: regions = raw ? [region.value] : resolveRegions(region.value, singleRegionOnly);
+  $: regions = raw ? [region.value] : resolveRegions(region.value, singleRegionOnly, showNeighbors);
   $: annotations = showAnnotations
     ? $annotationManager.getWindowAnnotations(sensor.value, regions, timeFrame.min, timeFrame.max)
     : [];
@@ -286,13 +298,14 @@
       singleRegionOnly,
       domain,
       cumulative,
+      showNeighbors,
     }),
     timeFrame,
     annotations,
   );
   $: data = raw
     ? loadSingleData(sensor, region, timeFrame, { cumulative })
-    : loadData(sensor, region, timeFrame, singleRegionOnly);
+    : loadData(sensor, region, timeFrame, singleRegionOnly, showNeighbors);
   $: fileName = generateFileName(sensor, regions, timeFrame, raw, cumulative);
 
   function findValue(region, data, date, prop = 'value') {

src/blocks/RegionHexMap.svelte

@@ -53,7 +53,9 @@
       const d = getInfoByName(tile.id, 'state');
       const value = dateData.then((lookup) => (lookup.get(d.propertyId) || [])[0]);
       const sparkLine = sparkLines
-        ? sparkLines.then((lookup) => addMissing(lookup.get(d.propertyId) || [], sensor.value))
+        ? sparkLines.then((lookup) =>
+            addMissing(lookup.get(d.propertyId) || [], sensor.isWeeklySignal ? 'week' : 'day'),
+          )
         : null;
       return {
         ...tile,

src/data/fetchData.ts

@@ -126,7 +126,7 @@ export function addMissing<T extends EpiDataRow = EpiDataRow>(rows: T[], granula
   const max = rows[rows.length - 1].date_value;
   const template = rows[0];
   const base = rows.slice();
-  const ranger = granularity == 'day' ? timeDay : timeWeek;
+  const ranger = granularity == 'week' ? timeWeek : timeDay;
   const range = ranger.range(min, ranger.offset(max, 1), 1);
   if (range.length === rows.length) {
     // full
@@ -178,16 +178,14 @@ export function averageByDate(rows: EpiDataRow[], mixin: Partial<EpiDataRow> = {
       byDate.set(key, [row]);
     }
   }
-  return Array.from(byDate.values())
-    .map((rows) => {
-      const r: EpiDataRow = {
-        ...rows[0],
-        ...mixin,
-        value: avg(rows, 'value')!,
-        stderr: avg(rows, 'stderr')!,
-        sample_size: avg(rows, 'sample_size')!,
-      };
-      return r;
-    })
-    .sort((a, b) => a.time_value - b.time_value);
+  return Array.from(byDate.values(), (rows) => {
+    const r: EpiDataRow = {
+      ...rows[0],
+      ...mixin,
+      value: avg(rows, 'value')!,
+      stderr: avg(rows, 'stderr')!,
+      sample_size: avg(rows, 'sample_size')!,
+    };
+    return r;
+  }).sort((a, b) => a.time_value - b.time_value);
 }

src/modes/survey-results/SurveyQuestion.svelte

@@ -109,7 +109,14 @@
 
     <hr />
     <div class="chart-300">
-      <HistoryLineChart {sensor} {date} {region} {fetcher} starts={question.addedInWave.published} />
+      <HistoryLineChart
+        {sensor}
+        {date}
+        {region}
+        {fetcher}
+        starts={question.addedInWave.published}
+        showNeighbors={false}
+      />
     </div>
 
     <IndicatorStatsLine {sensor} {date} {region} {fetcher} />

src/modes/survey-results/SurveyResults.svelte

@@ -7,7 +7,6 @@
   import { nationInfo, nameInfos, getStateOfCounty } from '../../data/regions';
   import MobileSurveyToc from './MobileSurveyToc.svelte';
   import { DateParam, RegionParam, SensorParam } from '../../stores/params';
-  import getRelatedCounties from '../../data/relatedRegions';
   import { modeByID } from '..';
   import { scrollIntoView } from '../../util';
   import { DataFetcher } from '../../stores/DataFetcher';
@@ -35,8 +34,8 @@
     if (region.level === 'county') {
       // state
       fetcher.fetchNSensor1RegionNDates(sensors, getStateOfCounty(region.value), date.windowTimeFrame);
-      // related regions
-      fetcher.fetchNSensorNRegionNDates(sensors, getRelatedCounties(region.value), date.windowTimeFrame);
+      // // related regions
+      // fetcher.fetchNSensorNRegionNDates(sensors, getRelatedCounties(region.value), date.windowTimeFrame);
     }
 
     Promise.all(loaded).then(() => {