Improve handling for URL-based signals & support COVIDcast EpiWeeks (#53)

* Improve handling for URL-based signals

Author: rzats

src/api/EpiData.ts

@@ -150,13 +150,17 @@ export function loadDataSet(
     });
 }
 
-export function fetchCOVIDcastMeta(): Promise<{ geo_type: string; signal: string; data_source: string }[]> {
+export function fetchCOVIDcastMeta(): Promise<
+  { geo_type: string; signal: string; data_source: string; time_type?: string }[]
+> {
   const url = new URL(ENDPOINT + `/covidcast_meta/`);
   url.searchParams.set('format', 'json');
-  return fetchImpl<{ geo_type: string; signal: string; data_source: string }[]>(url).catch((error) => {
-    console.warn('failed fetching data', error);
-    return [];
-  });
+  return fetchImpl<{ geo_type: string; signal: string; data_source: string; time_type?: string }[]>(url).catch(
+    (error) => {
+      console.warn('failed fetching data', error);
+      return [];
+    },
+  );
 }
 
 export function importCDC({ locations, auth }: { locations: string; auth?: string }): Promise<DataGroup | null> {
@@ -182,17 +186,20 @@ export function importCOVIDcast({
 }: {
   data_source: string;
   signal: string;
-  time_type?: 'day';
+  time_type?: string;
   geo_type: string;
   geo_value: string;
 }): Promise<DataGroup | null> {
-  const title = `[API] Delphi CODIDcast: ${geo_value} ${signal} (${data_source})`;
+  const title = `[API] COVIDcast: ${data_source}:${signal} (${geo_type}:${geo_value})`;
   return loadDataSet(
     title,
     'covidcast',
     {
-      time_type: 'day',
-      time_values: epiRange(firstDate.covidcast, currentDate),
+      time_type: time_type,
+      time_values:
+        time_type === 'day'
+          ? epiRange(firstDate.covidcast, currentDate)
+          : epiRange(firstEpiWeek.covidcast, currentEpiWeek),
     },
     { data_source, signal, time_type, geo_type, geo_value },
     ['value', 'stderr', 'sample_size'],

src/components/dialogs/dataSources/COVIDcast.svelte

@@ -47,7 +47,11 @@
   });
 
   export function importDataSet() {
-    return importCOVIDcast({ data_source, signal, geo_type, geo_value });
+    return fetchCOVIDcastMeta().then((res) => {
+      const meta = res.filter((row) => row.data_source === data_source && row.signal === signal);
+      const time_type = meta[0].time_type;
+      return importCOVIDcast({ data_source, signal, geo_type, geo_value, time_type });
+    });
   }
 </script>
 

src/data/data.ts

@@ -385,6 +385,7 @@ export const firstEpiWeek = {
   quidel: 201535,
   sensors: 201030,
   nowcast: 200901,
+  covidcast: 202001,
 };
 
 // first available date for each data source

src/deriveLinkDefaults.ts

@@ -158,9 +158,21 @@ export function initialLoader(datasets: ILinkConfig['datasets']) {
     return Promise.all(resolvedDataSets).then((data) => {
       const cleaned = data.filter((d): d is DataSet => d != null);
       cleaned.forEach((d) => {
-        if (d.params && !Array.isArray(d.params) && d.params._endpoint && d.params.regions) {
-          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-          d.title = `${d.params._endpoint} | ${d.params.regions} | ${d.title}`;
+        if (d.params && !Array.isArray(d.params) && d.params._endpoint) {
+          /* eslint-disable @typescript-eslint/restrict-template-expressions */
+          const col_name = d.title;
+          d.title = `${d.params._endpoint}`;
+          if (d.params.data_source && d.params.signal) {
+            d.title += ` > ${d.params.data_source}:${d.params.signal}`;
+          }
+          if (d.params.geo_type && d.params.geo_value) {
+            d.title += ` > ${d.params.geo_type}:${d.params.geo_value}`;
+          }
+          if (d.params.regions) {
+            d.title += ` > ${d.params.regions}`;
+          }
+          d.title += ` > ${col_name}`;
+          /* eslint-enable @typescript-eslint/restrict-template-expressions */
         }
         add(d);
       });