Merge pull request #900 from cmu-delphi/sgratzl/hhs_nation

Add nation/hhs support in COVIDcast classic

Author: sgratzl

src/components/MapBox/AMapBoxWrapper.js

@@ -133,7 +133,7 @@ export default class AMapBoxWrapper {
   }
 
   _setupReady() {
-    this.zoom.showStateLabels(this.level === 'state');
+    this.zoom.showStateLabels(this.level === 'state' || this.level === 'hhs' || this.level === 'nation');
     this.zoom.ready();
     this.markReady('setup');
   }
@@ -338,7 +338,7 @@ export default class AMapBoxWrapper {
     }
 
     if (oldLevel !== level) {
-      this.zoom.showStateLabels(level === 'state');
+      this.zoom.showStateLabels(level === 'state' || level === 'hhs' || level === 'nation');
     }
 
     const allEncodingLayers = this.getAllEncodingLayers();

src/data/fetchData.js

@@ -142,6 +142,9 @@ export function fetchData(
   if (!region) {
     return Promise.resolve([]);
   }
+  mixinValues.time_type = 'day'; // inject time_type
+  mixinValues.geo_type = level; // inject geo_type
+
   const transferFields = computeTransferFields(mixinValues, advanced, transferSignal);
   function fetchSeparate(defaultSignalIndex) {
     const extraDataFields = ['value'];
@@ -354,7 +357,7 @@ export function addMissing(rows, dataSensor) {
 
 export function addNameInfos(rows) {
   for (const row of rows) {
-    Object.assign(row, getInfoByName(row.geo_value));
+    Object.assign(row, getInfoByName(row.geo_value, row.geo_type));
   }
   return rows;
 }

src/maps/geo.js

@@ -3,6 +3,8 @@ import stateTopoJSON from './processed/state.topojson.json';
 import countyTopoJSON from './processed/county.topojson.json';
 import msaTopoJSON from './processed/msa.topojson.json';
 import hrrTopoJSON from './processed/hrr.topojson.json';
+import hhsTopoJSON from './processed/hhs.topojson.json';
+import nationTopoJSON from './processed/nation.topojson.json';
 import citiesRaw from './processed/cities.csv.js';
 import { generateGeo } from './utils';
 
@@ -44,25 +46,48 @@ function citiesGeo() {
 
 /**
  * loads all geo json sources
+ * @param {import('.').NameInfo} nationInfo
  * @param {import('.').NameInfo[]} stateInfo
  * @param {import('.').NameInfo[]} countyInfo
  * @param {import('.').NameInfo[]} msaInfo
  * @param {import('.').NameInfo[]} hrrInfo
+ * @param {import('.').NameInfo[]} hhsInfo
  * @param {string} megaLevel
  * @param {*} additionalProperties
  */
-export default function load(stateInfo, countyInfo, msaInfo, hrrInfo, megaLevel, additionalProperties = {}) {
+export default function load(
+  nationInfo,
+  stateInfo,
+  countyInfo,
+  msaInfo,
+  hrrInfo,
+  hhsInfo,
+  megaLevel,
+  additionalProperties = {},
+) {
+  const nation = generateGeo(nationTopoJSON, 'nation', [nationInfo], additionalProperties);
   const state = generateGeo(stateTopoJSON, 'state', stateInfo, additionalProperties);
   const county = generateGeo(countyTopoJSON, 'county', countyInfo, additionalProperties);
   const msa = generateGeo(msaTopoJSON, 'msa', msaInfo, additionalProperties);
   const hrr = generateGeo(hrrTopoJSON, 'hrr', hrrInfo, additionalProperties);
-  const mega = deriveMegaGeo(state.border, megaLevel);
   const cities = citiesGeo();
+  const hhs = generateGeo(hhsTopoJSON, 'hhs', hhsInfo, additionalProperties);
+  // inject city information
+  const byCityName = new Map(cities.features.map((d) => [d.properties.name, d.geometry]));
+  hhs.center.features.forEach((f) => {
+    f.geometry = byCityName.get(f.properties.name);
+  });
+  nation.center.features.forEach((f) => {
+    f.geometry = byCityName.get('Washington');
+  });
+  const mega = deriveMegaGeo(state.border, megaLevel);
   return {
     state,
+    nation,
     county,
     msa,
     hrr,
+    hhs,
     mega,
     cities,
   };

src/maps/index.js

@@ -1,9 +1,9 @@
 export * from './infos';
-import { stateInfo, countyInfo, msaInfo, hrrInfo, levelMegaCountyId } from './infos';
+import { nationInfo, stateInfo, countyInfo, msaInfo, hrrInfo, levelMegaCountyId, hhsInfo } from './infos';
 
 export function loadSources(additionalProperties = {}) {
   // mark to be loaded as fast as possible
   return import(/* webpackChunkName: 'geo' */ './geo').then((r) =>
-    r.default(stateInfo, countyInfo, msaInfo, hrrInfo, levelMegaCountyId, additionalProperties),
+    r.default(nationInfo, stateInfo, countyInfo, msaInfo, hrrInfo, hhsInfo, levelMegaCountyId, additionalProperties),
   );
 }

src/maps/infos.js

@@ -3,6 +3,7 @@ import stateRaw from './processed/state.csv.js';
 import msaRaw from './processed/msa.csv.js';
 import countyRaw from './processed/county.csv.js';
 import hrrRaw from './processed/hrr.csv.js';
+import hhsRaw from './processed/hhs.csv.js';
 
 export const levelMegaCountyId = 'mega-county';
 /**
@@ -14,7 +15,7 @@ export const levelMegaCountyId = 'mega-county';
  * @property {number} population
  * @property {string?} region just for state and county
  * @property {string?} state just for county
- * @property {'state' | 'county' | 'msa' | 'hrr' | 'nation'} level
+ * @property {'state' | 'county' | 'msa' | 'hrr' | 'nation' | 'hhs'} level
  */
 
 function parseCSV(csv, level, deriveDisplayName = (d) => d.name, extras = () => undefined) {
@@ -62,9 +63,9 @@ Object.entries(stateClasses).forEach(([key, value]) => {
 export const nationInfo = {
   level: 'nation',
   name: 'US',
-  id: 'us',
+  id: '0', // has to be an integer
   displayName: 'United States',
-  propertyId: 'us',
+  propertyId: 'US',
   population: stateInfo.reduce((acc, v) => acc + v.population, 0),
 };
 
@@ -81,6 +82,16 @@ export const countyInfo = parseCSV(
   },
 );
 export const hrrInfo = parseCSV(hrrRaw, 'hrr', (hrr) => `${hrr.state} - ${hrr.name} (HRR)`);
+export const hhsInfo = parseCSV(
+  hhsRaw,
+  'hhs',
+  (hhs) => `HHS Region ${hhs.id.length < 2 ? ' ' : ''}${hhs.id} ${hhs.name}`,
+  (hhs) => {
+    // hhs.propertyId = 'h' + hhs.propertyId; // HACK since HHS and HRR ids are the same
+    hhs.states = hhs.states.split(',');
+    hhs.population = hhs.states.reduce((acc, v) => acc + stateLookup.get(v.toLowerCase()).population, 0);
+  },
+);
 
 // generate mega counties by copying the states
 /**
@@ -109,10 +120,13 @@ export const infosByLevel = {
   msa: msaInfo.sort(sortByDisplayName),
   county: countyInfo.sort(sortByDisplayName),
   hrr: hrrInfo.sort(sortByDisplayName),
+  hhs: hhsInfo.sort(sortByDisplayName),
   [levelMegaCountyId]: megaCountyInfo.sort(sortByDisplayName),
 };
 
-export const nameInfos = stateInfo.concat(msaInfo, countyInfo, hrrInfo, megaCountyInfo).sort(sortByDisplayName);
+export const nameInfos = stateInfo
+  .concat(msaInfo, countyInfo, hrrInfo, megaCountyInfo, hhsInfo)
+  .sort(sortByDisplayName);
 
 /**
  * helper to resolve a given id to a name info object
@@ -167,7 +181,7 @@ export function computeMegaCountyPopulation(megaCounty, data) {
   if (!megaCounty || !data || megaCounty.level !== levelMegaCountyId) {
     return null;
   }
-  const state = getInfoByName(megaCounty.postal);
+  const state = getInfoByName(megaCounty.postal, 'state');
   if (!state || state.population == null || Number.isNaN(state.population)) {
     return null;
   }
@@ -176,7 +190,7 @@ export function computeMegaCountyPopulation(megaCounty, data) {
     if (!fips.startsWith(state.id) || fips === megaCounty.id) {
       return population;
     }
-    const county = getInfoByName(fips);
+    const county = getInfoByName(fips, 'county');
     if (!county || county.population == null || Number.isNaN(county.population)) {
       // invalid county, so we cannot compute the rest population, keep NaN from now on
       return Number.NaN;
@@ -199,5 +213,17 @@ export function getCountiesOfState(state) {
  * @param {NameInfo} county
  */
 export function getStateOfCounty(county) {
-  return getInfoByName(county.state);
+  return getInfoByName(county.state, 'state');
+}
+
+/**
+ * returns the states of a HHS Region
+ * @param {NameInfo} hhs
+ * @returns {NameInfo[]}
+ */
+export function getStatesOfHHS(hhs) {
+  if (hhs.level !== 'hhs') {
+    return [];
+  }
+  return hhs.states.map((d) => getInfoByName(d, 'state'));
 }

src/maps/processed/README.md

@@ -0,0 +1,11 @@
+
+
+## create a hhs shape
+```sh
+mapshaper -each 'hhs_region={"10":"3","11":"3","12":"4","13":"4","15":"9","16":"10","17":"5","18":"5","19":"7","20":"7","21":"4","22":"6","23":"1","24":"3","25":"1","26":"5","27":"5","28":"4","29":"7","30":"8","31":"7","32":"9","33":"1","34":"2","35":"6","36":"2","37":"4","38":"8","39":"5","40":"6","41":"10","42":"3","44":"1","45":"4","46":"8","47":"4","48":"6","49":"8","50":"1","51":"3","53":"10","54":"3","55":"5","56":"8","66":"9","69":"9","72":"2","78":"2","09":"1","01":"4","05":"6","08":"8","04":"9","06":"9","03":"9","02":"10"}[FID]'
+mapshaper -dissolve2 fields=hhs_region name=hhs target=state no-replace
+mapshaper -rename-fields fields=id=hhs_region target=hhs
+mapshaper -o format=topojson id-field=id target=hhs hhs.json
+```
+
+## create nation shape

src/maps/processed/cities.csv.js

@@ -55,7 +55,16 @@ Tampa;352957;12.430601855786824;-9.90637544591033
 Honolulu;347884;-9.720042064765895;-10.699587876299114
 Aurora;345803;-6.256241729058357;1.3501325160987412
 Anaheim;345012;-17.44631758048322;-2.835422990685346
-Santa Ana;334227;-17.429463225258868;-2.932081574058002
+Santa Ana;334227;-17.42946322
+  5258868;-2.
+9 3208157405
+ 8002
+
+
+
+
+ ,
+
 St. Louis;318416;4.948763957775884;0.06173242686326162
 Riverside;316619;-17.003408942240277;-2.816055278035148
 Corpus Christi;316381;-0.7764816986382742;-10.884368813608244
@@ -69,8 +78,8 @@ Toledo;282313;9.66449259343711;3.5897322100102844
 Greensboro;279639;13.380582796400157;-1.5500642996573628
 Newark;278427;16.718816263365177;3.9247991944093226
 Plano;274409;-0.11856273421631199;-5.719959634246842
-Henderson;270811;-14.642925536757707;-1.174082341335054
-Lincoln;268738;-0.05038192788261643;2.1452863390058377
+Henderson;270811;-14.642925536757;;707;-1.174082341335054
+Linc;;oln;268738;-0.05038192788261643;2.1452863390058377
 Buffalo;258959;12.869383964264998;5.332309494912177
 Jersey City;257342;16.78983467007687;3.9336499695491174
 Chula Vista;256780;-17.043846156449305;-4.16014310599635

src/maps/processed/hhs.csv.js

@@ -0,0 +1,11 @@
+export default `id;name;states
+1;Boston;CT,ME,MA,NH,RI,VT
+2;New York;NJ,NY,PR,VI
+3;Philadelphia;DE,DC,MD,PA,VA,WV
+4;Atlanta;AL,FL,GA,KY,MS,NC,SC,TN
+5;Chicago;IL,IN,MI,MN,OH,WI
+6;Dallas;AR,LA,NM,OK,TX
+7;Kansas City;IA,KS,MO,NE
+8;Denver;CO,MT,ND,SD,UT,WY
+9;San Francisco;AZ,CA,HI,NV,AS,MP,GU
+10;Seattle;AK,ID,OR,WA`;