Merge pull request #70 from cmu-delphi/release/v2.1.4

Release v2.1.4

Author: melange396

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "www-epivis",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "private": true,
   "license": "MIT",
   "description": "",

package.json

@@ -31,8 +31,8 @@
         if (ds) {
           // add the dataset itself
           addDataSet(ds);
-          // reset active datasets to fluview -> ili
-          $activeDatasets = [ds.datasets[1]];
+          // reset active datasets to fluview -> wili
+          $activeDatasets = [ds.datasets[0]];
           if (chart) {
             chart.fitData(true);
           }

src/App.svelte

@@ -9,7 +9,7 @@ import {
   fluViewRegions,
   gftLocations,
   ghtLocations,
-  nidssDenqueLocations,
+  nidssDengueLocations,
   nidssFluLocations,
   nowcastLocations,
   quidelLocations,
@@ -64,9 +64,11 @@ function loadEpidata(
   name: string,
   epidata: Record<string, unknown>[],
   columns: string[],
+  columnRenamings: Record<string, string>,
   params: Record<string, unknown>,
 ): DataGroup {
   const datasets: DataSet[] = [];
+  const colRenamings = new Map(Object.entries(columnRenamings));
 
   for (const col of columns) {
     const points: EpiPoint[] = [];
@@ -91,7 +93,11 @@ function loadEpidata(
       }
       points.push(new EpiPoint(date, row[col] as number));
     }
-    datasets.push(new DataSet(points, col, params));
+    if (points.length > 0) {
+      // overwrite default column name if there's an overwrite in columnRenamings
+      const title = colRenamings.has(col) ? colRenamings.get(col) : col;
+      datasets.push(new DataSet(points, title, params));
+    }
   }
   return new DataGroup(name, datasets);
 }
@@ -112,6 +118,7 @@ export function loadDataSet(
   fixedParams: Record<string, unknown>,
   userParams: Record<string, unknown>,
   columns: string[],
+  columnRenamings: Record<string, string> = {},
 ): Promise<DataGroup | null> {
   const duplicates = get(expandedDataGroups).filter((d) => d.title == title);
   if (duplicates.length > 0) {
@@ -135,7 +142,18 @@ export function loadDataSet(
   url.searchParams.set('format', 'json');
   return fetchImpl<Record<string, unknown>[]>(url)
     .then((res) => {
-      return loadEpidata(title, res, columns, { _endpoint: endpoint, ...params });
+      const data = loadEpidata(title, res, columns, columnRenamings, { _endpoint: endpoint, ...params });
+      if (data.datasets.length == 0) {
+        return UIkit.modal
+          .alert(
+            `
+        <div class="uk-alert uk-alert-error">
+          <a href="${url.href}">API Link</a> returned no data.
+        </div>`,
+          )
+          .then(() => null);
+      }
+      return data;
     })
     .catch((error) => {
       console.warn('failed fetching data', error);
@@ -318,7 +336,7 @@ export function importFluView({
   auth?: string;
 }): Promise<DataGroup | null> {
   const regionLabel = fluViewRegions.find((d) => d.value === regions)?.label ?? '?';
-  const title = appendIssueToTitle(`[API] FluView: ${regionLabel}`, { issues, lag });
+  const title = appendIssueToTitle(`[API] ILINet (aka FluView): ${regionLabel}`, { issues, lag });
   return loadDataSet(
     title,
     'fluview',
@@ -339,6 +357,10 @@ export function importFluView({
       'num_age_4',
       'num_age_5',
     ],
+    {
+      wili: '%wILI',
+      ili: '%ILI',
+    },
   );
 }
 
@@ -378,9 +400,9 @@ export function importGHT({
   );
 }
 
-export function importNIDSSDenque({ locations }: { locations: string }): Promise<DataGroup | null> {
-  const regionLabel = nidssDenqueLocations.find((d) => d.value === locations)?.label ?? '?';
-  const title = `[API] NIDSS-Denque: ${regionLabel}`;
+export function importNIDSSDengue({ locations }: { locations: string }): Promise<DataGroup | null> {
+  const regionLabel = nidssDengueLocations.find((d) => d.value === locations)?.label ?? '?';
+  const title = `[API] NIDSS-Dengue: ${regionLabel}`;
   return loadDataSet(
     title,
     'nidss_dengue',

src/api/EpiData.ts

@@ -49,11 +49,6 @@
       return;
     }
     switch (e.key) {
-      case 'f':
-        if (chart) {
-          chart.fitData(true);
-        }
-        break;
       case 'a':
         $navMode = NavMode.autofit;
         break;

src/components/TopMenu.svelte

@@ -36,7 +36,7 @@
     | 'cdc'
     | 'quidel'
     | 'nidss_flu'
-    | 'nidss_denque'
+    | 'nidss_dengue'
     | 'sensors'
     | 'nowcast'
     | 'covidcast'
@@ -72,7 +72,7 @@
       <div class="uk-form-controls uk-form-controls-text">
         <label
           ><input class="uk-radio" type="radio" name="dataSource" bind:group={dataSource} value="fluview" />
-          FluView (source:
+          ILINet (aka FluView) (source:
           <a target="_blank" href="https://gis.cdc.gov/grasp/fluview/fluportaldashboard.html">cdc.gov</a>)
         </label>
         <label
@@ -156,7 +156,7 @@
       <Wiki {id} bind:this={handler} />
     {:else if dataSource === 'quidel'}
       <Quidel {id} bind:this={handler} />
-    {:else if dataSource === 'nidss_denque'}
+    {:else if dataSource === 'nidss_dengue'}
       <NidssDengue {id} bind:this={handler} />
     {:else if dataSource === 'nidss_flu'}
       <NidssFlu {id} bind:this={handler} />

src/components/dialogs/ImportAPIDialog.svelte

@@ -1,14 +1,14 @@
 <script lang="ts">
-  import { importNIDSSDenque } from '../../../api/EpiData';
-  import { nidssDenqueLocations as regions } from '../../../data/data';
+  import { importNIDSSDengue } from '../../../api/EpiData';
+  import { nidssDengueLocations as regions } from '../../../data/data';
   import SelectField from '../inputs/SelectField.svelte';
 
   export let id: string;
 
   let locations = regions[0].value;
 
   export function importDataSet() {
-    return importNIDSSDenque({ locations });
+    return importNIDSSDengue({ locations });
   }
 </script>
 

src/components/dialogs/dataSources/NIDSSDengue.svelte

@@ -315,7 +315,7 @@ export const nidssFluLocations = [
   { value: 'taipei', label: 'Taipei' },
 ];
 
-export const nidssDenqueLocations = [
+export const nidssDengueLocations = [
   { value: 'nationwide', label: 'Taiwan National' },
   { value: 'central', label: 'Central' },
   { value: 'eastern', label: 'Eastern' },

src/data/data.ts

@@ -6,7 +6,7 @@ import {
   importFluView,
   importGFT,
   importGHT,
-  importNIDSSDenque,
+  importNIDSSDengue,
   importNIDSSFlu,
   importNowcast,
   importQuidel,
@@ -53,7 +53,7 @@ const lookups = {
   fluview: importFluView,
   gft: importGFT,
   ght: importGHT,
-  nidss_denque: importNIDSSDenque,
+  nidss_dengue: importNIDSSDengue,
   nidss_flu: importNIDSSFlu,
   nowcast: importNowcast,
   quidel: importQuidel,