Populate tooltips with summary data

scripts/generateOptions.ts

@@ -57,7 +57,7 @@ let activityTypeOpts: Option[] = [];
     if (activityTypeValue && !activityTypeOpts.find(o => o.value === activityTypeValue)) {
       activityTypeOpts.push({
         value: activityTypeValue,
-        label: titleCase(activityTypeValue)
+        label: titleCase(activityTypeValue)!
       });
     }
   }

src/assets/styles/main.css

@@ -44,8 +44,9 @@
   border: 1px solid black;
   border-radius: 0.25em;
   padding: 0.5em;
-  opacity: 0.8;
+  opacity: 0.9;
   position: relative;
   top: 40px;
   right: 100px;
+  width: max-content;
 }

src/composables/usePlotTooltips.ts

@@ -1,39 +1,68 @@
 import { useAppStore } from "@/stores/appStore";
 import { useColorStore } from "@/stores/colorStore";
-import { Axis, type PointWithMetadata } from "@/types";
+import { useDataStore } from "@/stores/dataStore";
+import { Axis, SummaryTableColumn, type PointWithMetadata } from "@/types";
 import { dimensionOptionLabel } from "@/utils/options";
 import sentenceCase from "@/utils/sentenceCase";
 
 export default () => {
   const colorStore = useColorStore();
   const appStore = useAppStore();
+  const dataStore = useDataStore();
 
   // Generate HTML for tooltips on ridgeline plot points.
+  // This callback is passed to skadi-chart, and is invoked when hovering over the chart.
   const tooltipCallback = (point: PointWithMetadata) => {
     if (!point.metadata) return "";
 
     const { strokeColor } = colorStore.getColorsForLine(point.metadata)
-    const { colorDimension } = colorStore;
+    const { colorAxis, colorDimension } = colorStore;
     const { dimensions } = appStore;
 
-    const rowOptionLabel = dimensionOptionLabel(colorDimension, point.metadata[colorStore.colorAxis]);
+    const valueForColorDimension = point.metadata[colorAxis];
+
+    const colorDimensionLabel = dimensionOptionLabel(colorDimension, valueForColorDimension);
+    const rowOptionLabel = dimensionOptionLabel(dimensions.row, point.metadata[Axis.ROW]);
     const columnOptionLabel = dimensionOptionLabel(dimensions.column, point.metadata[Axis.COLUMN]);
 
+    const { summaryTableData } = dataStore;
+
+    const summaryDataRow = summaryTableData.find(d => {
+      return Object.entries(dimensions).every(([axis, dim]) => {
+        return !dim || d[dim] === point.metadata?.[axis as Axis];
+      });
+    });
+
+    // NB regardless of whether log scale is enabled, the summary table data are expressed in non-log scale.
+    const [median, mean, ciLower, ciUpper] = [
+      SummaryTableColumn.MEDIAN,
+      SummaryTableColumn.MEAN,
+      SummaryTableColumn.CI_LOWER,
+      SummaryTableColumn.CI_UPPER,
+    ].map(col => summaryDataRow?.[col]);
+
+    const includePositiveSign = ciLower && ciLower < 0;
+    const ciLowerMaybeWithSign = ciLower?.toFixed(2);
+    const ciUpperMaybeWithSign = `${includePositiveSign ? `${ciUpper && ciUpper > 0 ? '+' : ''}` : ''}${ciUpper?.toFixed(2)}`;
+
     return `<div class="tooltip text-xs flex flex-col gap-1 w-75">
-      <div class="flex gap-1 items-center">
-        <span style="color: ${strokeColor}; font-size: 1.3rem;">●</span>
-        <span class="mt-1 flex flex-wrap gap-5">
-          <span>
-            ${sentenceCase(colorDimension)}: <strong>${rowOptionLabel}</strong>
-          </span>
-          ${dimensions.column ? `<span>
-            ${sentenceCase(dimensions.column)}: <strong>${columnOptionLabel}</strong>
-          </span>` : ''}
+      <div class="flex gap-1 h-6 items-center">
+        <span style="color: ${strokeColor}; font-size: 1.5rem;">●</span>
+        <span class="mt-1">
+          ${sentenceCase(colorDimension)}: <strong>${colorDimensionLabel}</strong>
         </span>
       </div>
-      <p>Tooltip content is TODO. VIMC-9196</p>
+      ${dimensions.row !== colorDimension ? `<span>
+        ${sentenceCase(dimensions.row)}: <strong>${rowOptionLabel}</strong>
+      </span>` : ''}
+      ${dimensions.column && dimensions.column !== colorDimension ? `<span>
+        ${sentenceCase(dimensions.column)}: <strong>${columnOptionLabel}</strong>
+      </span>` : ''}
+      <p class="mt-1">
+        Median: <strong>${median?.toFixed(2)}</strong>, Mean: <strong>${mean?.toFixed(2)}</strong><br/>
+      </p>
       <p>
-        Will show the median/mean values and 95% confidence interval for the whole line.
+        95% confidence interval: <strong>${ciLowerMaybeWithSign}</strong> — <strong>${ciUpperMaybeWithSign}</strong>
       </p>
     </div>`
   }

src/stores/dataStore.ts

@@ -1,8 +1,9 @@
 import { debounce } from "perfect-debounce";
-import { computed, ref, shallowRef, watch } from "vue";
+import { computed, ref, shallowRef, watch, type ShallowRef } from "vue";
 import { defineStore } from "pinia";
 import { useAppStore } from "@/stores/appStore";
-import { type HistDataRow, Dimension, LocResolution } from "@/types";
+import { type HistDataRow, type SummaryTableDataRow, Dimension, LocResolution } from "@/types";
+import { globalOption } from "@/utils/options";
 
 export const dataDir = `./data/json`
 
@@ -11,13 +12,14 @@ export const useDataStore = defineStore("data", () => {
 
   const fetchErrors = ref<{ e: Error, message: string }[]>([]);
   const histogramData = shallowRef<HistDataRow[]>([]);
-  const histogramDataCache: Record<string, HistDataRow[]> = {};
+  const histogramCache: Record<string, HistDataRow[]> = {};
+  const summaryTableData = shallowRef<SummaryTableDataRow[]>([]);
+  const summaryTableCache: Record<string, SummaryTableDataRow[]> = {};
   const isLoading = ref(true);
 
-  const histogramDataPaths = computed(() => {
-    // When we are using multiple geographical resolutions, we need to load multiple data files, to be merged together later.
+  const constructFilenames = (dataType: "hist_counts" | "summary_table"): string[] => {
     return appStore.geographicalResolutions.map((geog) => {
-      const fileNameParts = ["hist_counts", appStore.burdenMetric, "disease"];
+      const fileNameParts = [dataType, appStore.burdenMetric, "disease"];
       // NB files containing 'global' data simply omit location from the file name (as they have no location stratification).
       if (geog === LocResolution.SUBREGION) {
         fileNameParts.push(LocResolution.SUBREGION);
@@ -28,59 +30,83 @@ export const useDataStore = defineStore("data", () => {
       if (geog === LocResolution.COUNTRY) {
         fileNameParts.push(LocResolution.COUNTRY);
       }
-      if (appStore.logScaleEnabled) {
+      if (dataType === "hist_counts" && appStore.logScaleEnabled) {
+        // Log scale is not applicable for summary tables, so does not appear in the filenames.
         fileNameParts.push("log");
       }
-      return `${fileNameParts.join("_")}.json`
+      return `${fileNameParts.join("_")}.json`;
     });
-  });
+  }
 
-  // Fetch and parse multiple JSONs, and merge together all data.
-  const loadDataFromPaths = async (paths: string[]) => {
-    isLoading.value = true;
-    fetchErrors.value = [];
-    await Promise.all(paths.map(async (path) => {
-      if (!histogramDataCache[path]) {
+  const histFilenames = computed(() => constructFilenames("hist_counts"));
+  const summaryTableFilenames = computed(() => constructFilenames("summary_table"));
+
+  const loadData = async <T extends HistDataRow | SummaryTableDataRow>(
+    filenames: string[],
+    cache: Record<string, T[]>,
+    ref: ShallowRef<T[]>,
+  ) => {
+    // When we are using multiple geographical resolutions, we load multiple data files, to be merged together later.
+    await Promise.all(filenames.map(async (filename) => {
+      if (!cache[filename]) {
+        const path = `${dataDir}/${filename}`;
         try {
-          const response = await fetch(`${dataDir}/${path}`);
+          const response = await fetch(path);
           if (!response.ok) {
             throw new Error(`HTTP ${response.status}: ${response.statusText}`);
           }
           const rows = await response.json();
-          histogramDataCache[path] = rows;
+          cache[filename] = rows;
           return rows;
         } catch (error) {
           fetchErrors.value.push({ e: error as Error, message: `Error loading data from path: ${path}. ${error}` });
         }
       }
     }));
 
-    histogramData.value = paths.flatMap((path) => histogramDataCache[path] || []).map((row) => {
+    // Merge data fetched from multiple files into one array.
+    ref.value = filenames.flatMap((filename) => {
+      return (cache[filename] || []) as T[];
+    }).map((row) => {
       // Collapse all geographic columns into one 'location' column
-      if (row[LocResolution.COUNTRY]) {
-        row[Dimension.LOCATION] = row[LocResolution.COUNTRY];
-        delete row[LocResolution.COUNTRY];
-      } else if (row[LocResolution.SUBREGION]) {
-        row[Dimension.LOCATION] = row[LocResolution.SUBREGION];
-        delete row[LocResolution.SUBREGION];
+      const [country, subregion] = [row[LocResolution.COUNTRY], row[LocResolution.SUBREGION]];
+      const newRow = { ...row };
+      if (country) {
+        newRow[Dimension.LOCATION] = country;
+        delete newRow[LocResolution.COUNTRY];
+      } else if (subregion) {
+        newRow[Dimension.LOCATION] = subregion;
+        delete newRow[LocResolution.SUBREGION];
+      } else {
+        newRow[Dimension.LOCATION] = globalOption.value;
       }
-      return row;
+      return newRow;
     });
     isLoading.value = false;
   };
 
-  const doLoadData = debounce(async () => {
-    await loadDataFromPaths(histogramDataPaths.value);
+  const loadAllData = async () => {
+    isLoading.value = true;
+    fetchErrors.value = [];
+    await Promise.all([
+      loadData<HistDataRow>(histFilenames.value, histogramCache, histogramData),
+      loadData<SummaryTableDataRow>(summaryTableFilenames.value, summaryTableCache, summaryTableData),
+    ]);
+    isLoading.value = false;
+  };
+
+  const debouncedLoadAllData = debounce(async () => {
+    await loadAllData();
   }, 25)
 
-  watch(histogramDataPaths, async (_oldPaths, newPaths) => {
-    if (newPaths) {
-      doLoadData();
+  watch([histFilenames, summaryTableFilenames], async (_oldPaths, newPaths) => {
+    if (newPaths.length) {
+      debouncedLoadAllData();
     } else {
-      // This is the first time histDataPaths is calculated, so don't debounce.
-      await loadDataFromPaths(histogramDataPaths.value);
+      // This is the first time the filenames are computed, so don't debounce.
+      await loadAllData();
     }
   }, { immediate: true });
 
-  return { histogramData, fetchErrors, isLoading };
+  return { fetchErrors, isLoading, histogramData, summaryTableData };
 });

src/types.ts

@@ -24,21 +24,22 @@ export enum HistColumn {
   COUNTS = "Counts",
 }
 
-type DataRow = Record<string, string | number>;
-export type SummaryTableDataRow = DataRow & {
-  [Dimension.DISEASE]: string;
-  [LocResolution.COUNTRY]?: string;
-  [LocResolution.SUBREGION]?: string;
-};
-export type HistDataRow = DataRow & {
+export enum SummaryTableColumn {
+  MEAN = "mean_value",
+  MEDIAN = "median_value",
+  CI_LOWER = "lower_95",
+  CI_UPPER = "upper_95",
+}
+
+type DataRow = Record<string, string | number> & {
   [Dimension.DISEASE]: string;
+  [Dimension.ACTIVITY_TYPE]?: string;
   [LocResolution.COUNTRY]?: string;
   [LocResolution.SUBREGION]?: string;
   [Dimension.LOCATION]?: string;
-  [HistColumn.LOWER_BOUND]: number;
-  [HistColumn.UPPER_BOUND]: number;
-  [HistColumn.COUNTS]: number;
 };
+export type HistDataRow = DataRow & Record<HistColumn, number>;
+export type SummaryTableDataRow = DataRow & Record<SummaryTableColumn, number>;
 
 export type Option = { label: string; value: string };