From 7056e57aceb74d4ca23e5361a220fc04bc4bdd12 Mon Sep 17 00:00:00 2001
From: Rostyslav Zatserkovnyi <zatserkovnyi.rostyslav@gmail.com>
Date: Wed, 28 Aug 2024 18:14:28 +0300
Subject: [PATCH 1/8] Remove redundant 'f' hotkey (#58)

---
 src/components/TopMenu.svelte | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/components/TopMenu.svelte b/src/components/TopMenu.svelte
index 878a698..6545423 100644
--- a/src/components/TopMenu.svelte
+++ b/src/components/TopMenu.svelte
@@ -49,11 +49,6 @@
       return;
     }
     switch (e.key) {
-      case 'f':
-        if (chart) {
-          chart.fitData(true);
-        }
-        break;
       case 'a':
         $navMode = NavMode.autofit;
         break;

From f1c1ff70e68bc3c19dcad97367d35876e2b49699 Mon Sep 17 00:00:00 2001
From: Rostyslav Zatserkovnyi <zatserkovnyi.rostyslav@gmail.com>
Date: Mon, 16 Sep 2024 19:12:26 +0300
Subject: [PATCH 2/8] Fix empty datasets locking UI

---
 src/api/EpiData.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/api/EpiData.ts b/src/api/EpiData.ts
index 866063e..cb965f2 100644
--- a/src/api/EpiData.ts
+++ b/src/api/EpiData.ts
@@ -91,7 +91,9 @@ function loadEpidata(
       }
       points.push(new EpiPoint(date, row[col] as number));
     }
-    datasets.push(new DataSet(points, col, params));
+    if (points.length > 0) {
+      datasets.push(new DataSet(points, col, params));
+    }
   }
   return new DataGroup(name, datasets);
 }
@@ -135,7 +137,19 @@ 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, { _endpoint: endpoint, ...params });
+      if (data.datasets.length == 0) {
+        console.warn('empty datasets');
+        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);

From fa3f51fc5fcc7a8de14c0b735ac3ddadb529e2c7 Mon Sep 17 00:00:00 2001
From: Rostyslav Zatserkovnyi <zatserkovnyi.rostyslav@gmail.com>
Date: Mon, 16 Sep 2024 19:14:33 +0300
Subject: [PATCH 3/8] warning not needed

---
 src/api/EpiData.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/api/EpiData.ts b/src/api/EpiData.ts
index cb965f2..b059736 100644
--- a/src/api/EpiData.ts
+++ b/src/api/EpiData.ts
@@ -139,7 +139,6 @@ export function loadDataSet(
     .then((res) => {
       const data = loadEpidata(title, res, columns, { _endpoint: endpoint, ...params });
       if (data.datasets.length == 0) {
-        console.warn('empty datasets');
         return UIkit.modal
           .alert(
             `

From 2907c97c0a823944ebbd29d65ad82dbaa7e01fdc Mon Sep 17 00:00:00 2001
From: Rostyslav Zatserkovnyi <zatserkovnyi.rostyslav@gmail.com>
Date: Tue, 17 Sep 2024 17:25:00 +0300
Subject: [PATCH 4/8] Update default FluView display

---
 src/App.svelte     |  4 ++--
 src/api/EpiData.ts | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index 047c4d7..e5b147f 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -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);
           }
diff --git a/src/api/EpiData.ts b/src/api/EpiData.ts
index 866063e..c880abc 100644
--- a/src/api/EpiData.ts
+++ b/src/api/EpiData.ts
@@ -64,9 +64,11 @@ function loadEpidata(
   name: string,
   epidata: Record<string, unknown>[],
   columns: string[],
+  columnNames: Record<string, string>,
   params: Record<string, unknown>,
 ): DataGroup {
   const datasets: DataSet[] = [];
+  const colNames = new Map(Object.entries(columnNames));
 
   for (const col of columns) {
     const points: EpiPoint[] = [];
@@ -91,7 +93,9 @@ function loadEpidata(
       }
       points.push(new EpiPoint(date, row[col] as number));
     }
-    datasets.push(new DataSet(points, col, params));
+    // overwrite default column name if there's an overwrite in columnNames
+    const title = colNames.has(col) ? colNames.get(col) : col;
+    datasets.push(new DataSet(points, title, params));
   }
   return new DataGroup(name, datasets);
 }
@@ -112,6 +116,7 @@ export function loadDataSet(
   fixedParams: Record<string, unknown>,
   userParams: Record<string, unknown>,
   columns: string[],
+  columnNames: Record<string, string> = {},
 ): Promise<DataGroup | null> {
   const duplicates = get(expandedDataGroups).filter((d) => d.title == title);
   if (duplicates.length > 0) {
@@ -135,7 +140,7 @@ export function loadDataSet(
   url.searchParams.set('format', 'json');
   return fetchImpl<Record<string, unknown>[]>(url)
     .then((res) => {
-      return loadEpidata(title, res, columns, { _endpoint: endpoint, ...params });
+      return loadEpidata(title, res, columns, columnNames, { _endpoint: endpoint, ...params });
     })
     .catch((error) => {
       console.warn('failed fetching data', error);
@@ -318,7 +323,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 +344,10 @@ export function importFluView({
       'num_age_4',
       'num_age_5',
     ],
+    {
+      wili: '%wILI',
+      ili: '%ILI',
+    },
   );
 }
 

From 0ce4ef6d4d92b838416c7993fde98ba2f9d660f3 Mon Sep 17 00:00:00 2001
From: Rostyslav Zatserkovnyi <zatserkovnyi.rostyslav@gmail.com>
Date: Tue, 17 Sep 2024 17:27:24 +0300
Subject: [PATCH 5/8] rename in import box

---
 src/components/dialogs/ImportAPIDialog.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/dialogs/ImportAPIDialog.svelte b/src/components/dialogs/ImportAPIDialog.svelte
index 21b380b..145bdff 100644
--- a/src/components/dialogs/ImportAPIDialog.svelte
+++ b/src/components/dialogs/ImportAPIDialog.svelte
@@ -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

From 377fadd27c65fdaa63710aa50baba5c6cbf65425 Mon Sep 17 00:00:00 2001
From: Rostyslav Zatserkovnyi <zatserkovnyi.rostyslav@gmail.com>
Date: Tue, 24 Sep 2024 14:54:01 +0300
Subject: [PATCH 6/8] Change columnNames to columnRenamings

---
 src/api/EpiData.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/api/EpiData.ts b/src/api/EpiData.ts
index c880abc..1cf7014 100644
--- a/src/api/EpiData.ts
+++ b/src/api/EpiData.ts
@@ -64,11 +64,11 @@ function loadEpidata(
   name: string,
   epidata: Record<string, unknown>[],
   columns: string[],
-  columnNames: Record<string, string>,
+  columnRenamings: Record<string, string>,
   params: Record<string, unknown>,
 ): DataGroup {
   const datasets: DataSet[] = [];
-  const colNames = new Map(Object.entries(columnNames));
+  const colRenamings = new Map(Object.entries(columnRenamings));
 
   for (const col of columns) {
     const points: EpiPoint[] = [];
@@ -93,8 +93,8 @@ function loadEpidata(
       }
       points.push(new EpiPoint(date, row[col] as number));
     }
-    // overwrite default column name if there's an overwrite in columnNames
-    const title = colNames.has(col) ? colNames.get(col) : col;
+    // 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);
@@ -116,7 +116,7 @@ export function loadDataSet(
   fixedParams: Record<string, unknown>,
   userParams: Record<string, unknown>,
   columns: string[],
-  columnNames: Record<string, string> = {},
+  columnRenamings: Record<string, string> = {},
 ): Promise<DataGroup | null> {
   const duplicates = get(expandedDataGroups).filter((d) => d.title == title);
   if (duplicates.length > 0) {
@@ -140,7 +140,7 @@ export function loadDataSet(
   url.searchParams.set('format', 'json');
   return fetchImpl<Record<string, unknown>[]>(url)
     .then((res) => {
-      return loadEpidata(title, res, columns, columnNames, { _endpoint: endpoint, ...params });
+      return loadEpidata(title, res, columns, columnRenamings, { _endpoint: endpoint, ...params });
     })
     .catch((error) => {
       console.warn('failed fetching data', error);

From c3e6c5b0b903e1d5f1920783082f220d038f583a Mon Sep 17 00:00:00 2001
From: Rostyslav Zatserkovnyi <zatserkovnyi.rostyslav@gmail.com>
Date: Tue, 24 Sep 2024 14:58:09 +0300
Subject: [PATCH 7/8] Rename mentions of denque to the proper dengue

---
 src/api/EpiData.ts                                    | 8 ++++----
 src/components/dialogs/ImportAPIDialog.svelte         | 4 ++--
 src/components/dialogs/dataSources/NIDSSDengue.svelte | 6 +++---
 src/data/data.ts                                      | 2 +-
 src/deriveLinkDefaults.ts                             | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/api/EpiData.ts b/src/api/EpiData.ts
index b059736..160c04e 100644
--- a/src/api/EpiData.ts
+++ b/src/api/EpiData.ts
@@ -9,7 +9,7 @@ import {
   fluViewRegions,
   gftLocations,
   ghtLocations,
-  nidssDenqueLocations,
+  nidssDengueLocations,
   nidssFluLocations,
   nowcastLocations,
   quidelLocations,
@@ -391,9 +391,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',
diff --git a/src/components/dialogs/ImportAPIDialog.svelte b/src/components/dialogs/ImportAPIDialog.svelte
index 21b380b..0fa3e16 100644
--- a/src/components/dialogs/ImportAPIDialog.svelte
+++ b/src/components/dialogs/ImportAPIDialog.svelte
@@ -36,7 +36,7 @@
     | 'cdc'
     | 'quidel'
     | 'nidss_flu'
-    | 'nidss_denque'
+    | 'nidss_dengue'
     | 'sensors'
     | 'nowcast'
     | 'covidcast'
@@ -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} />
diff --git a/src/components/dialogs/dataSources/NIDSSDengue.svelte b/src/components/dialogs/dataSources/NIDSSDengue.svelte
index 0d428e7..4797946 100644
--- a/src/components/dialogs/dataSources/NIDSSDengue.svelte
+++ b/src/components/dialogs/dataSources/NIDSSDengue.svelte
@@ -1,6 +1,6 @@
 <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;
@@ -8,7 +8,7 @@
   let locations = regions[0].value;
 
   export function importDataSet() {
-    return importNIDSSDenque({ locations });
+    return importNIDSSDengue({ locations });
   }
 </script>
 
diff --git a/src/data/data.ts b/src/data/data.ts
index f5ad543..5ac4618 100644
--- a/src/data/data.ts
+++ b/src/data/data.ts
@@ -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' },
diff --git a/src/deriveLinkDefaults.ts b/src/deriveLinkDefaults.ts
index 2743042..2a23da9 100644
--- a/src/deriveLinkDefaults.ts
+++ b/src/deriveLinkDefaults.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,

From d344557ad40670fc377bca45dced855e9ea65c17 Mon Sep 17 00:00:00 2001
From: melange396 <melange396@users.noreply.github.com>
Date: Thu, 26 Sep 2024 19:23:15 +0000
Subject: [PATCH 8/8] chore: release v2.1.4

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a329f90..b6ceb0a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "www-epivis",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "www-epivis",
-      "version": "2.1.3",
+      "version": "2.1.4",
       "license": "MIT",
       "dependencies": {
         "uikit": "^3.15.5"
diff --git a/package.json b/package.json
index 97aa2e6..472d575 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "www-epivis",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "private": true,
   "license": "MIT",
   "description": "",