diff --git a/app/src/components/views/RSVView.jsx b/app/src/components/views/RSVView.jsx
index b1c1eada..2219287b 100644
--- a/app/src/components/views/RSVView.jsx
+++ b/app/src/components/views/RSVView.jsx
@@ -1,10 +1,7 @@
-import ForecastPlotView from '../ForecastPlotView';
+import ForecastPlotView from "../ForecastPlotView";
const RSVView = (props) => (
-
+
);
export default RSVView;
diff --git a/app/src/config/app.js b/app/src/config/app.js
index c0ab8abc..819f3236 100644
--- a/app/src/config/app.js
+++ b/app/src/config/app.js
@@ -1,8 +1,8 @@
export const APP_CONFIG = {
- defaultDataset: 'covid',
- defaultView: 'frontpage',
- defaultLocation: 'US',
- datasetDisplayOrder: ['covid', 'flu', 'metrocast', 'rsv', 'nhsn'],
+ defaultDataset: "covid",
+ defaultView: "frontpage",
+ defaultLocation: "US",
+ datasetDisplayOrder: ["covid", "flu", "metrocast", "rsv", "nhsn"],
features: {
enableForecastle: true,
enableNarratives: true,
diff --git a/app/src/config/datasets.js b/app/src/config/datasets.js
index e00c8523..c5bc63c7 100644
--- a/app/src/config/datasets.js
+++ b/app/src/config/datasets.js
@@ -1,92 +1,90 @@
export const DATASETS = {
flu: {
- shortName: 'flu',
- fullName: 'Flu Forecast',
- titleName: 'Flusight Forecasts',
+ shortName: "flu",
+ fullName: "Flu Forecast",
+ titleName: "Flusight Forecasts",
views: [
- { key: 'detailed', label: 'Detailed Forecasts View', value: 'fludetailed' },
- { key: 'forecasts', label: 'Forecasts', value: 'flu_forecasts' },
- { key: 'peak', label: "Peak Forecasts", value: 'flu_peak'}
+ {
+ key: "detailed",
+ label: "Detailed Forecasts View",
+ value: "fludetailed",
+ },
+ { key: "forecasts", label: "Forecasts", value: "flu_forecasts" },
+ { key: "peak", label: "Peak Forecasts", value: "flu_peak" },
],
- defaultView: 'flu_forecasts',
- defaultModel: 'FluSight-ensemble',
+ defaultView: "flu_forecasts",
+ defaultModel: "FluSight-ensemble",
hasDateSelector: true,
hasModelSelector: true,
- prefix: 'flu',
- dataPath: 'flusight',
- targetLineDayOfWeek: 3 // Wednesday (0=Sunday, 3=Wednesday)
+ prefix: "flu",
+ dataPath: "flusight",
+ targetLineDayOfWeek: 3, // Wednesday (0=Sunday, 3=Wednesday)
},
rsv: {
- shortName: 'rsv',
- fullName: 'RSV Forecast',
- titleName: 'RSV Forecast Hub',
- views: [
- { key: 'forecasts', label: 'Forecasts', value: 'rsv_forecasts' }
- ],
- defaultView: 'rsv_forecasts',
- defaultModel: 'RSVHub-ensemble',
+ shortName: "rsv",
+ fullName: "RSV Forecast",
+ titleName: "RSV Forecast Hub",
+ views: [{ key: "forecasts", label: "Forecasts", value: "rsv_forecasts" }],
+ defaultView: "rsv_forecasts",
+ defaultModel: "RSVHub-ensemble",
hasDateSelector: true,
hasModelSelector: true,
- prefix: 'rsv',
- dataPath: 'rsv',
- targetLineDayOfWeek: 3 // Wednesday (0=Sunday, 3=Wednesday)
+ prefix: "rsv",
+ dataPath: "rsv",
+ targetLineDayOfWeek: 3, // Wednesday (0=Sunday, 3=Wednesday)
},
covid: {
- shortName: 'covid',
- fullName: 'COVID-19 Forecasts',
- titleName: 'COVID-19 Forecast Hub',
- views: [
- { key: 'forecasts', label: 'Forecasts', value: 'covid_forecasts' }
- ],
- defaultView: 'covid_forecasts',
- defaultModel: 'CovidHub-ensemble',
+ shortName: "covid",
+ fullName: "COVID-19 Forecasts",
+ titleName: "COVID-19 Forecast Hub",
+ views: [{ key: "forecasts", label: "Forecasts", value: "covid_forecasts" }],
+ defaultView: "covid_forecasts",
+ defaultModel: "CovidHub-ensemble",
hasDateSelector: true,
hasModelSelector: true,
- prefix: 'covid',
- dataPath: 'covid19',
- targetLineDayOfWeek: 3 // Wednesday (0=Sunday, 3=Wednesday)
+ prefix: "covid",
+ dataPath: "covid19",
+ targetLineDayOfWeek: 3, // Wednesday (0=Sunday, 3=Wednesday)
},
nhsn: {
- shortName: 'nhsn',
- fullName: 'NHSN Respiratory Data',
- titleName: 'NHSN Respiratory Data',
- views: [
- { key: 'all', label: 'All Data', value: 'nhsnall' }
- ],
- defaultView: 'nhsnall',
- defaultColumn: 'Number of Adult COVID-19 Admissions, 18-49 years',
+ shortName: "nhsn",
+ fullName: "NHSN Respiratory Data",
+ titleName: "NHSN Respiratory Data",
+ views: [{ key: "all", label: "All Data", value: "nhsnall" }],
+ defaultView: "nhsnall",
+ defaultColumn: "Number of Adult COVID-19 Admissions, 18-49 years",
hasDateSelector: false,
hasModelSelector: false,
- prefix: 'nhsn',
- dataPath: 'nhsn'
+ prefix: "nhsn",
+ dataPath: "nhsn",
},
metrocast: {
- shortName: 'metrocast',
- fullName: 'Flu MetroCast Forecasts',
- titleName: 'Flu MetroCast Forecasts',
+ shortName: "metrocast",
+ fullName: "Flu MetroCast Forecasts",
+ titleName: "Flu MetroCast Forecasts",
views: [
- { key: 'forecasts', label: 'Forecasts', value: 'metrocast_forecasts' }
+ { key: "forecasts", label: "Forecasts", value: "metrocast_forecasts" },
],
- defaultView: 'metrocast_forecasts',
- defaultModel: 'epiENGAGE-ensemble_mean',
- defaultLocation: 'colorado',
+ defaultView: "metrocast_forecasts",
+ defaultModel: "epiENGAGE-ensemble_mean",
+ defaultLocation: "colorado",
hasDateSelector: true,
hasModelSelector: true,
- prefix: 'metrocast',
- dataPath: 'flumetrocast',
- targetLineDayOfWeek: 3
-},
+ prefix: "metrocast",
+ dataPath: "flumetrocast",
+ targetLineDayOfWeek: 3,
+ },
};
// Helper function to get all valid view values
export const getAllViewValues = () => {
- return Object.values(DATASETS).flatMap(dataset =>
- dataset.views.map(view => view.value)
+ return Object.values(DATASETS).flatMap((dataset) =>
+ dataset.views.map((view) => view.value),
);
};
// Import centralized colors from theme
-import { MODEL_COLORS, getModelColor } from '../theme/mantine.js';
+import { MODEL_COLORS, getModelColor } from "../theme/mantine.js";
// Re-export for backward compatibility
export { MODEL_COLORS, getModelColor };
diff --git a/app/src/config/forecastle.js b/app/src/config/forecastle.js
index f7bf3df2..5c7077dc 100644
--- a/app/src/config/forecastle.js
+++ b/app/src/config/forecastle.js
@@ -28,9 +28,9 @@ export const FORECASTLE_CONFIG = {
* These match the target column names in the forecast data
*/
targetKeys: {
- flusight: 'wk inc flu hosp',
- rsv: 'wk inc rsv hosp',
- covid19: 'wk inc covid hosp',
+ flusight: "wk inc flu hosp",
+ rsv: "wk inc rsv hosp",
+ covid19: "wk inc covid hosp",
},
/**
@@ -41,8 +41,8 @@ export const FORECASTLE_CONFIG = {
* - Number: Show last N weeks of data
*/
historyDisplay: {
- flusight: 'seasonStart',
- rsv: 'seasonStart',
+ flusight: "seasonStart",
+ rsv: "seasonStart",
covid19: 20, // Last 20 weeks (~5 months)
default: 26, // Last 26 weeks (~6 months)
},
diff --git a/app/src/config/index.js b/app/src/config/index.js
index 7c8ab1ee..57be3e2a 100644
--- a/app/src/config/index.js
+++ b/app/src/config/index.js
@@ -9,25 +9,40 @@
*/
// Dataset configuration
-import { DATASETS, getAllViewValues, MODEL_COLORS, getModelColor } from './datasets';
+import {
+ DATASETS,
+ getAllViewValues,
+ MODEL_COLORS,
+ getModelColor,
+} from "./datasets";
// Application defaults
-import { APP_CONFIG } from './app';
+import { APP_CONFIG } from "./app";
// Forecastle game settings
-import { FORECASTLE_CONFIG } from './forecastle';
+import { FORECASTLE_CONFIG } from "./forecastle";
// Tournament settings
-import { TOURNAMENT_CONFIG, getChallengeById, getChallengeByNumber, areAllChallengesCompleted } from './tournament';
+import {
+ TOURNAMENT_CONFIG,
+ getChallengeById,
+ getChallengeByNumber,
+ areAllChallengesCompleted,
+} from "./tournament";
// Visualization and chart settings
-import { CHART_CONFIG } from './visualization';
+import { CHART_CONFIG } from "./visualization";
// Re-export all configurations
export { DATASETS, getAllViewValues, MODEL_COLORS, getModelColor };
export { APP_CONFIG };
export { FORECASTLE_CONFIG };
-export { TOURNAMENT_CONFIG, getChallengeById, getChallengeByNumber, areAllChallengesCompleted };
+export {
+ TOURNAMENT_CONFIG,
+ getChallengeById,
+ getChallengeByNumber,
+ areAllChallengesCompleted,
+};
export { CHART_CONFIG };
/**
diff --git a/app/src/config/tournament.js b/app/src/config/tournament.js
index b220eca9..4ec09361 100644
--- a/app/src/config/tournament.js
+++ b/app/src/config/tournament.js
@@ -5,16 +5,19 @@
export const TOURNAMENT_CONFIG = {
// Tournament ID
- id: 'epidemics-10',
+ id: "epidemics-10",
// Tournament metadata
- name: 'Epidemics 10 Forecasting Tournament',
- description: 'Compete in 3 epidemic forecasting challenges and climb the leaderboard',
+ name: "Epidemics 10 Forecasting Tournament",
+ description:
+ "Compete in 3 epidemic forecasting challenges and climb the leaderboard",
// Google Sheets integration
// IMPORTANT: Replace with your deployed Google Apps Script Web App URL
- apiUrl: import.meta.env.VITE_TOURNAMENT_API_URL || 'https://script.google.com/macros/s/AKfycbwB7LnE8DSk9S7ACLs20j65iB-9ryCXAiih2FlMwpeWDDE4pLZ1zF3RQilfrm6_byLU7w/exec',
- sheetId: '17J5KWUrVuqmqqBcVJg2A-dfVdrL4LjXTvlztCDpS0g0',
+ apiUrl:
+ import.meta.env.VITE_TOURNAMENT_API_URL ||
+ "https://script.google.com/macros/s/AKfycbwB7LnE8DSk9S7ACLs20j65iB-9ryCXAiih2FlMwpeWDDE4pLZ1zF3RQilfrm6_byLU7w/exec",
+ sheetId: "17J5KWUrVuqmqqBcVJg2A-dfVdrL4LjXTvlztCDpS0g0",
// Challenges are always active (no date restrictions as per requirements)
challengesAlwaysActive: true,
@@ -26,55 +29,58 @@ export const TOURNAMENT_CONFIG = {
// Using historical dates where ground truth is already available
challenges: [
{
- id: 'ch-1',
+ id: "ch-1",
number: 1,
- title: 'California Influenza Forecast',
- description: 'Predict California flu hospitalizations for 1, 2, and 3 weeks ahead',
- dataset: 'flu',
- datasetKey: 'flusight',
- dataPath: 'flusight',
- fileSuffix: 'flu.json',
- location: 'CA',
- displayName: 'California',
- target: 'wk inc flu hosp',
+ title: "California Influenza Forecast",
+ description:
+ "Predict California flu hospitalizations for 1, 2, and 3 weeks ahead",
+ dataset: "flu",
+ datasetKey: "flusight",
+ dataPath: "flusight",
+ fileSuffix: "flu.json",
+ location: "CA",
+ displayName: "California",
+ target: "wk inc flu hosp",
horizons: [1, 2, 3],
- forecastDate: '2023-11-11',
+ forecastDate: "2023-11-11",
},
{
- id: 'ch-2',
+ id: "ch-2",
number: 2,
- title: 'Colorado Influenza Forecast',
- description: 'Predict Colorado flu hospitalizations for 1, 2, and 3 weeks ahead',
- dataset: 'flu',
- datasetKey: 'flusight',
- dataPath: 'flusight',
- fileSuffix: 'flu.json',
- location: 'CO',
- displayName: 'Colorado',
- target: 'wk inc flu hosp',
+ title: "Colorado Influenza Forecast",
+ description:
+ "Predict Colorado flu hospitalizations for 1, 2, and 3 weeks ahead",
+ dataset: "flu",
+ datasetKey: "flusight",
+ dataPath: "flusight",
+ fileSuffix: "flu.json",
+ location: "CO",
+ displayName: "Colorado",
+ target: "wk inc flu hosp",
horizons: [1, 2, 3],
- forecastDate: '2025-01-18',
+ forecastDate: "2025-01-18",
},
{
- id: 'ch-3',
+ id: "ch-3",
number: 3,
- title: 'North Carolina COVID-19 Forecast',
- description: 'Predict North Carolina COVID hospitalizations for 1, 2, and 3 weeks ahead',
- dataset: 'covid',
- datasetKey: 'covid19',
- dataPath: 'covid19forecasthub',
- fileSuffix: 'covid19.json',
- location: 'NC',
- displayName: 'North Carolina',
- target: 'wk inc covid hosp',
+ title: "North Carolina COVID-19 Forecast",
+ description:
+ "Predict North Carolina COVID hospitalizations for 1, 2, and 3 weeks ahead",
+ dataset: "covid",
+ datasetKey: "covid19",
+ dataPath: "covid19forecasthub",
+ fileSuffix: "covid19.json",
+ location: "NC",
+ displayName: "North Carolina",
+ target: "wk inc covid hosp",
horizons: [1, 2, 3],
- forecastDate: '2025-09-13',
+ forecastDate: "2025-09-13",
},
],
// Scoring configuration
scoring: {
- method: 'WIS', // Weighted Interval Score
+ method: "WIS", // Weighted Interval Score
lowerIsBetter: true, // Lower WIS is better
intervals: [50, 95], // 50% and 95% prediction intervals
},
@@ -85,7 +91,7 @@ export const TOURNAMENT_CONFIG = {
showRealNames: true, // Display participant names
showScoreBreakdown: true, // Show detailed WIS breakdown
onlyShowCompleted: false, // Show all participants, not just those who completed all challenges
- rankingMethod: 'avgWIS', // Rank by average WIS across all challenges
+ rankingMethod: "avgWIS", // Rank by average WIS across all challenges
},
// UI settings
@@ -97,22 +103,22 @@ export const TOURNAMENT_CONFIG = {
// Progress indicators
showProgress: true,
- progressStyle: 'dots', // 'dots' or 'bar'
+ progressStyle: "dots", // 'dots' or 'bar'
// Medals for top 3
medals: {
- 1: '🥇',
- 2: '🥈',
- 3: '🥉',
+ 1: "🥇",
+ 2: "🥈",
+ 3: "🥉",
},
},
// Storage keys for localStorage
storageKeys: {
- participantId: 'tournament_participant_id',
- participantName: 'tournament_participant_name',
- submissions: 'tournament_submissions',
- lastSync: 'tournament_last_sync',
+ participantId: "tournament_participant_id",
+ participantName: "tournament_participant_name",
+ submissions: "tournament_submissions",
+ lastSync: "tournament_last_sync",
},
// Feature flags
@@ -130,7 +136,7 @@ export const TOURNAMENT_CONFIG = {
* @returns {Object|null} Challenge configuration or null if not found
*/
export const getChallengeById = (challengeId) => {
- return TOURNAMENT_CONFIG.challenges.find(c => c.id === challengeId) || null;
+ return TOURNAMENT_CONFIG.challenges.find((c) => c.id === challengeId) || null;
};
/**
@@ -139,7 +145,10 @@ export const getChallengeById = (challengeId) => {
* @returns {Object|null} Challenge configuration or null if not found
*/
export const getChallengeByNumber = (challengeNumber) => {
- return TOURNAMENT_CONFIG.challenges.find(c => c.number === challengeNumber) || null;
+ return (
+ TOURNAMENT_CONFIG.challenges.find((c) => c.number === challengeNumber) ||
+ null
+ );
};
/**
@@ -151,7 +160,7 @@ export const areAllChallengesCompleted = (submissions) => {
if (!submissions || submissions.length === 0) return false;
const completedChallenges = new Set(
- submissions.map(sub => sub.challengeNum)
+ submissions.map((sub) => sub.challengeNum),
);
return completedChallenges.size === TOURNAMENT_CONFIG.numChallenges;
diff --git a/app/src/config/visualization.js b/app/src/config/visualization.js
index cbdbf903..c24cd828 100644
--- a/app/src/config/visualization.js
+++ b/app/src/config/visualization.js
@@ -29,8 +29,8 @@ export const CHART_CONFIG = {
* Values are strings to match CSS/SVG opacity format
*/
opacity: {
- ci95: '10', // 95% confidence interval (lighter)
- ci50: '30', // 50% confidence interval (darker)
+ ci95: "10", // 95% confidence interval (lighter)
+ ci50: "30", // 50% confidence interval (darker)
},
/**
@@ -44,7 +44,7 @@ export const CHART_CONFIG = {
* Colors used in the Forecastle game for user-drawn forecasts
*/
forecastleColors: {
- interval95: 'rgba(220, 20, 60, 0.25)', // Crimson with transparency
- interval50: 'rgba(220, 20, 60, 0.45)', // Crimson with more opacity
+ interval95: "rgba(220, 20, 60, 0.25)", // Crimson with transparency
+ interval50: "rgba(220, 20, 60, 0.45)", // Crimson with more opacity
},
};
diff --git a/app/src/constants/chart.js b/app/src/constants/chart.js
index e57555e3..8afe18eb 100644
--- a/app/src/constants/chart.js
+++ b/app/src/constants/chart.js
@@ -1,5 +1,5 @@
// Chart and visualization constants
-import { CHART_CONFIG } from '../config';
+import { CHART_CONFIG } from "../config";
export const CHART_CONSTANTS = {
// Plot dimensions (from centralized config)
@@ -22,7 +22,7 @@ export const CHART_CONSTANTS = {
ROWS: 3,
COLUMNS: 2,
ROW_HEIGHTS: [0.6, 0.2, 0.2],
- COLUMN_WIDTHS: [0.5, 0.5]
+ COLUMN_WIDTHS: [0.5, 0.5],
},
// Default margins
@@ -30,18 +30,18 @@ export const CHART_CONSTANTS = {
LEFT: 60,
RIGHT: 30,
TOP: 30,
- BOTTOM: 30
+ BOTTOM: 30,
},
// Y-axis padding percentage (from centralized config)
- Y_AXIS_PADDING_PERCENT: CHART_CONFIG.yAxisPaddingPercent
+ Y_AXIS_PADDING_PERCENT: CHART_CONFIG.yAxisPaddingPercent,
};
// Rate change category order
export const RATE_CHANGE_CATEGORIES = [
- 'large_decrease',
- 'decrease',
- 'stable',
- 'increase',
- 'large_increase'
-];
\ No newline at end of file
+ "large_decrease",
+ "decrease",
+ "stable",
+ "increase",
+ "large_increase",
+];
diff --git a/app/src/contexts/ViewContext.jsx b/app/src/contexts/ViewContext.jsx
index 26fc344a..5b0713b4 100644
--- a/app/src/contexts/ViewContext.jsx
+++ b/app/src/contexts/ViewContext.jsx
@@ -1,60 +1,89 @@
-import { useState, useCallback, useEffect, useMemo } from 'react';
-import { useLocation, useSearchParams } from 'react-router-dom';
-import { URLParameterManager } from '../utils/urlManager';
-import { useForecastData } from '../hooks/useForecastData';
-import { ViewContext } from './ViewContextObject';
-import { APP_CONFIG } from '../config';
+import { useState, useCallback, useEffect, useMemo } from "react";
+import { useLocation, useSearchParams } from "react-router-dom";
+import { URLParameterManager } from "../utils/urlManager";
+import { useForecastData } from "../hooks/useForecastData";
+import { ViewContext } from "./ViewContextObject";
+import { APP_CONFIG } from "../config";
export const ViewProvider = ({ children }) => {
const [searchParams, setSearchParams] = useSearchParams();
const location = useLocation();
- const isForecastPage = location.pathname === '/';
+ const isForecastPage = location.pathname === "/";
- const urlManager = useMemo(() => new URLParameterManager(searchParams, setSearchParams), [searchParams, setSearchParams]);
+ const urlManager = useMemo(
+ () => new URLParameterManager(searchParams, setSearchParams),
+ [searchParams, setSearchParams],
+ );
const [viewType, setViewTypeState] = useState(() => urlManager.getView());
const [selectedLocation, setSelectedLocation] = useState(() => {
- const urlLoc = urlManager.getLocation();
+ const urlLoc = urlManager.getLocation();
const currentView = urlManager.getView();
const dataset = urlManager.getDatasetFromView(currentView);
if (dataset?.defaultLocation && urlLoc === APP_CONFIG.defaultLocation) {
return dataset.defaultLocation;
}
-
+
return urlLoc;
});
const [selectedModels, setSelectedModels] = useState([]);
const [selectedDates, setSelectedDates] = useState([]);
const [activeDate, setActiveDate] = useState(null);
const [selectedTarget, setSelectedTarget] = useState(null);
- const [chartScale, setChartScale] = useState(() => urlManager.getAdvancedParams().chartScale);
- const [intervalVisibility, setIntervalVisibility] = useState(() => urlManager.getAdvancedParams().intervalVisibility);
- const [showLegend, setShowLegend] = useState(() => urlManager.getAdvancedParams().showLegend);
- const CURRENT_FLU_SEASON_START = '2025-11-01'; // !! CRITICAL !!: need to change this manually based on the season (for flu peak view)
-
- const { data, metadata, loading, error, availableDates, models, availableTargets, modelsByTarget, peaks, availablePeakDates, availablePeakModels } = useForecastData(selectedLocation, viewType);
+ const [chartScale, setChartScale] = useState(
+ () => urlManager.getAdvancedParams().chartScale,
+ );
+ const [intervalVisibility, setIntervalVisibility] = useState(
+ () => urlManager.getAdvancedParams().intervalVisibility,
+ );
+ const [showLegend, setShowLegend] = useState(
+ () => urlManager.getAdvancedParams().showLegend,
+ );
+ const CURRENT_FLU_SEASON_START = "2025-11-01"; // !! CRITICAL !!: need to change this manually based on the season (for flu peak view)
+
+ const {
+ data,
+ metadata,
+ loading,
+ error,
+ availableDates,
+ models,
+ availableTargets,
+ modelsByTarget,
+ peaks,
+ availablePeakDates,
+ availablePeakModels,
+ } = useForecastData(selectedLocation, viewType);
// filter flu_peak dates based on current season
const availableDatesToExpose = useMemo(() => {
- if (viewType === 'flu_peak') {
- return (availablePeakDates || []).filter(date => date >= CURRENT_FLU_SEASON_START);
+ if (viewType === "flu_peak") {
+ return (availablePeakDates || []).filter(
+ (date) => date >= CURRENT_FLU_SEASON_START,
+ );
}
return availableDates || [];
}, [viewType, availablePeakDates, availableDates]);
-
- const updateDatasetParams = useCallback((params) => {
- const currentDataset = urlManager.getDatasetFromView(viewType);
- if (currentDataset) urlManager.updateDatasetParams(currentDataset, params);
- }, [viewType, urlManager]);
+
+ const updateDatasetParams = useCallback(
+ (params) => {
+ const currentDataset = urlManager.getDatasetFromView(viewType);
+ if (currentDataset)
+ urlManager.updateDatasetParams(currentDataset, params);
+ },
+ [viewType, urlManager],
+ );
const modelsForView = useMemo(() => {
- if (viewType === 'fludetailed') {
- const target1Models = new Set(modelsByTarget['wk inc flu hosp'] || []);
- const target2Models = new Set(modelsByTarget['wk flu hosp rate change'] || []);
+ if (viewType === "fludetailed") {
+ const target1Models = new Set(modelsByTarget["wk inc flu hosp"] || []);
+ const target2Models = new Set(
+ modelsByTarget["wk flu hosp rate change"] || [],
+ );
return Array.from(new Set([...target1Models, ...target2Models])).sort();
}
- if (viewType === 'flu_peak') {
+ if (viewType === "flu_peak") {
return availablePeakModels || [];
}
@@ -62,26 +91,31 @@ export const ViewProvider = ({ children }) => {
return modelsByTarget[selectedTarget];
}
- return [];
- }, [selectedTarget, modelsByTarget, viewType, availablePeakModels]);
+ return [];
+ }, [selectedTarget, modelsByTarget, viewType, availablePeakModels]);
const availableTargetsToExpose = useMemo(() => {
- if (viewType === 'flu_peak') {
+ if (viewType === "flu_peak") {
return [];
}
-
- const peakTargets = ['peak inc flu hosp', 'peak week inc flu hosp'];
-
- return availableTargets.filter(target => !peakTargets.includes(target));
- }, [availableTargets, viewType]);
+ const peakTargets = ["peak inc flu hosp", "peak week inc flu hosp"];
+
+ return availableTargets.filter((target) => !peakTargets.includes(target));
+ }, [availableTargets, viewType]);
useEffect(() => {
if (!isForecastPage) {
return;
}
const currentDataset = urlManager.getDatasetFromView(viewType);
- if (loading || !currentDataset || modelsForView.length === 0 || availableDatesToExpose.length === 0 || availableTargets.length === 0) {
+ if (
+ loading ||
+ !currentDataset ||
+ modelsForView.length === 0 ||
+ availableDatesToExpose.length === 0 ||
+ availableTargets.length === 0
+ ) {
return;
}
@@ -89,23 +123,30 @@ export const ViewProvider = ({ children }) => {
let needsModelUrlUpdate = false;
let modelsToSet = [];
- const validUrlModels = params.models?.filter(m => modelsForView.includes(m)) || [];
+ const validUrlModels =
+ params.models?.filter((m) => modelsForView.includes(m)) || [];
if (validUrlModels.length > 0) {
- modelsToSet = validUrlModels;
- } else if (currentDataset.defaultModel && modelsForView.includes(currentDataset.defaultModel)) {
- modelsToSet = [currentDataset.defaultModel];
- needsModelUrlUpdate = true;
+ modelsToSet = validUrlModels;
+ } else if (
+ currentDataset.defaultModel &&
+ modelsForView.includes(currentDataset.defaultModel)
+ ) {
+ modelsToSet = [currentDataset.defaultModel];
+ needsModelUrlUpdate = true;
} else if (modelsForView.length > 0) {
- modelsToSet = [modelsForView[0]];
- needsModelUrlUpdate = true;
+ modelsToSet = [modelsForView[0]];
+ needsModelUrlUpdate = true;
}
let datesToSet = [];
- const validUrlDates = params.dates?.filter(date => availableDatesToExpose.includes(date)) || [];
+ const validUrlDates =
+ params.dates?.filter((date) => availableDatesToExpose.includes(date)) ||
+ [];
if (validUrlDates.length > 0) {
datesToSet = validUrlDates;
} else {
- const latestDate = availableDatesToExpose[availableDatesToExpose.length - 1];
+ const latestDate =
+ availableDatesToExpose[availableDatesToExpose.length - 1];
if (latestDate) {
datesToSet = [latestDate];
}
@@ -114,12 +155,20 @@ export const ViewProvider = ({ children }) => {
const urlTarget = params.target;
let targetToSet = null;
if (urlTarget && availableTargets.includes(urlTarget)) {
- targetToSet = urlTarget;
+ targetToSet = urlTarget;
}
- setSelectedModels(current => JSON.stringify(current) !== JSON.stringify(modelsToSet) ? modelsToSet : current);
- setSelectedDates(current => JSON.stringify(current) !== JSON.stringify(datesToSet) ? datesToSet : current);
- setActiveDate(currentActive => {
+ setSelectedModels((current) =>
+ JSON.stringify(current) !== JSON.stringify(modelsToSet)
+ ? modelsToSet
+ : current,
+ );
+ setSelectedDates((current) =>
+ JSON.stringify(current) !== JSON.stringify(datesToSet)
+ ? datesToSet
+ : current,
+ );
+ setActiveDate((currentActive) => {
if (currentActive && datesToSet.includes(currentActive)) {
return currentActive;
}
@@ -131,14 +180,25 @@ export const ViewProvider = ({ children }) => {
}
if (needsModelUrlUpdate) {
- updateDatasetParams({ models: [] });
+ updateDatasetParams({ models: [] });
}
- }, [isForecastPage, loading, viewType, models, availableTargets, urlManager, updateDatasetParams, selectedTarget, modelsForView, availableDatesToExpose]);
+ }, [
+ isForecastPage,
+ loading,
+ viewType,
+ models,
+ availableTargets,
+ urlManager,
+ updateDatasetParams,
+ selectedTarget,
+ modelsForView,
+ availableDatesToExpose,
+ ]);
useEffect(() => {
const availableModelsSet = new Set(modelsForView);
- const cleanedSelectedModels = selectedModels.filter(model =>
- availableModelsSet.has(model)
+ const cleanedSelectedModels = selectedModels.filter((model) =>
+ availableModelsSet.has(model),
);
if (cleanedSelectedModels.length !== selectedModels.length) {
@@ -150,16 +210,17 @@ export const ViewProvider = ({ children }) => {
if (loading || !availableTargets || availableTargets.length === 0) {
return;
}
- const isCurrentTargetValid = selectedTarget && availableTargets.includes(selectedTarget);
+ const isCurrentTargetValid =
+ selectedTarget && availableTargets.includes(selectedTarget);
if (!isCurrentTargetValid) {
setSelectedTarget(availableTargets[0]);
}
}, [loading, availableTargets, selectedTarget]);
-
const handleLocationSelect = (newLocation) => {
const currentDataset = urlManager.getDatasetFromView(viewType);
- const effectiveDefault = currentDataset?.defaultLocation || APP_CONFIG.defaultLocation;
+ const effectiveDefault =
+ currentDataset?.defaultLocation || APP_CONFIG.defaultLocation;
urlManager.updateLocation(newLocation, effectiveDefault);
setSelectedLocation(newLocation);
};
@@ -170,67 +231,77 @@ export const ViewProvider = ({ children }) => {
updateDatasetParams({ target: target });
};
- const handleViewChange = useCallback((newView) => {
- const oldView = viewType;
- if (oldView === newView) return;
-
- const oldDataset = urlManager.getDatasetFromView(oldView);
- const newDataset = urlManager.getDatasetFromView(newView);
- const newSearchParams = new URLSearchParams(searchParams);
-
-
- const isMovingToMetrocast = newView === 'metrocast_forecasts';
-
- if (isMovingToMetrocast) {
- const needsCityDefault = selectedLocation === APP_CONFIG.defaultLocation || selectedLocation.length === 2;
-
- if (needsCityDefault && newDataset?.defaultLocation) {
- setSelectedLocation(newDataset.defaultLocation);
- newSearchParams.delete('location');
+ const handleViewChange = useCallback(
+ (newView) => {
+ const oldView = viewType;
+ if (oldView === newView) return;
+
+ const oldDataset = urlManager.getDatasetFromView(oldView);
+ const newDataset = urlManager.getDatasetFromView(newView);
+ const newSearchParams = new URLSearchParams(searchParams);
+
+ const isMovingToMetrocast = newView === "metrocast_forecasts";
+
+ if (isMovingToMetrocast) {
+ const needsCityDefault =
+ selectedLocation === APP_CONFIG.defaultLocation ||
+ selectedLocation.length === 2;
+
+ if (needsCityDefault && newDataset?.defaultLocation) {
+ setSelectedLocation(newDataset.defaultLocation);
+ newSearchParams.delete("location");
+ }
+ } else {
+ if (
+ selectedLocation !== APP_CONFIG.defaultLocation &&
+ selectedLocation.length > 2
+ ) {
+ setSelectedLocation(APP_CONFIG.defaultLocation);
+ newSearchParams.delete("location");
+ }
}
- } else {
- if (selectedLocation !== APP_CONFIG.defaultLocation && selectedLocation.length > 2) {
- setSelectedLocation(APP_CONFIG.defaultLocation);
- newSearchParams.delete('location');
- }
- }
- if (newView !== APP_CONFIG.defaultView || newSearchParams.toString().length > 0) {
- newSearchParams.set('view', newView);
- } else {
- newSearchParams.delete('view');
- }
-
- const isDatasetChange = oldDataset?.shortName !== newDataset?.shortName;
- const isPeakTransition = oldView === 'flu_peak' || newView === 'flu_peak'; // reset if coming or going from flu_peak
-
- if (isDatasetChange || isPeakTransition) {
- setSelectedDates([]);
- setSelectedModels([]);
- setActiveDate(null);
- setSelectedTarget(null);
-
- if (oldDataset) {
- newSearchParams.delete(`${oldDataset.prefix}_models`);
- newSearchParams.delete(`${oldDataset.prefix}_dates`);
- newSearchParams.delete(`${oldDataset.prefix}_target`);
+ if (
+ newView !== APP_CONFIG.defaultView ||
+ newSearchParams.toString().length > 0
+ ) {
+ newSearchParams.set("view", newView);
+ } else {
+ newSearchParams.delete("view");
}
- if (oldDataset?.shortName === 'nhsn') {
- newSearchParams.delete('nhsn_target');
- newSearchParams.delete('nhsn_cols');
+ const isDatasetChange = oldDataset?.shortName !== newDataset?.shortName;
+ const isPeakTransition = oldView === "flu_peak" || newView === "flu_peak"; // reset if coming or going from flu_peak
+
+ if (isDatasetChange || isPeakTransition) {
+ setSelectedDates([]);
+ setSelectedModels([]);
+ setActiveDate(null);
+ setSelectedTarget(null);
+
+ if (oldDataset) {
+ newSearchParams.delete(`${oldDataset.prefix}_models`);
+ newSearchParams.delete(`${oldDataset.prefix}_dates`);
+ newSearchParams.delete(`${oldDataset.prefix}_target`);
+ }
+
+ if (oldDataset?.shortName === "nhsn") {
+ newSearchParams.delete("nhsn_target");
+ newSearchParams.delete("nhsn_cols");
+ }
+ } else {
+ if (newDataset) {
+ newSearchParams.delete(`${newDataset.prefix}_target`);
+ }
+ setSelectedTarget(null);
}
- } else {
- if (newDataset) {
- newSearchParams.delete(`${newDataset.prefix}_target`);
- }
- setSelectedTarget(null);
- }
- setViewTypeState(newView);
- // Push history for view changes so browser back works between forecast views.
- setSearchParams(newSearchParams, { replace: false });
- }, [viewType, searchParams, setSearchParams, urlManager, selectedLocation]);
+ setViewTypeState(newView);
+ // Push history for view changes so browser back works between forecast views.
+ setSearchParams(newSearchParams, { replace: false });
+ },
+ [viewType, searchParams, setSearchParams, urlManager, selectedLocation],
+ );
useEffect(() => {
const viewFromUrl = urlManager.getView();
@@ -243,7 +314,11 @@ export const ViewProvider = ({ children }) => {
if (!isForecastPage) {
return;
}
- const { chartScale: urlScale, intervalVisibility: urlIntervals, showLegend: urlLegend } = urlManager.getAdvancedParams();
+ const {
+ chartScale: urlScale,
+ intervalVisibility: urlIntervals,
+ showLegend: urlLegend,
+ } = urlManager.getAdvancedParams();
if (urlScale !== chartScale) {
setChartScale(urlScale);
}
@@ -253,78 +328,106 @@ export const ViewProvider = ({ children }) => {
if (urlLegend !== showLegend) {
setShowLegend(urlLegend);
}
- }, [searchParams, urlManager, isForecastPage, chartScale, intervalVisibility, showLegend]);
-
- const setChartScaleWithUrl = useCallback((nextScale) => {
- setChartScale(nextScale);
- if (isForecastPage) {
- urlManager.updateAdvancedParams({ chartScale: nextScale });
- }
- }, [urlManager, isForecastPage]);
+ }, [
+ searchParams,
+ urlManager,
+ isForecastPage,
+ chartScale,
+ intervalVisibility,
+ showLegend,
+ ]);
- const setIntervalVisibilityWithUrl = useCallback((updater) => {
- setIntervalVisibility(prev => {
- const next = typeof updater === 'function' ? updater(prev) : updater;
+ const setChartScaleWithUrl = useCallback(
+ (nextScale) => {
+ setChartScale(nextScale);
if (isForecastPage) {
- urlManager.updateAdvancedParams({ intervalVisibility: next });
+ urlManager.updateAdvancedParams({ chartScale: nextScale });
}
- return next;
- });
- }, [urlManager, isForecastPage]);
+ },
+ [urlManager, isForecastPage],
+ );
- const setShowLegendWithUrl = useCallback((nextShowLegend) => {
- setShowLegend(nextShowLegend);
- if (isForecastPage) {
- urlManager.updateAdvancedParams({ showLegend: nextShowLegend });
- }
- }, [urlManager, isForecastPage]);
+ const setIntervalVisibilityWithUrl = useCallback(
+ (updater) => {
+ setIntervalVisibility((prev) => {
+ const next = typeof updater === "function" ? updater(prev) : updater;
+ if (isForecastPage) {
+ urlManager.updateAdvancedParams({ intervalVisibility: next });
+ }
+ return next;
+ });
+ },
+ [urlManager, isForecastPage],
+ );
+
+ const setShowLegendWithUrl = useCallback(
+ (nextShowLegend) => {
+ setShowLegend(nextShowLegend);
+ if (isForecastPage) {
+ urlManager.updateAdvancedParams({ showLegend: nextShowLegend });
+ }
+ },
+ [urlManager, isForecastPage],
+ );
const contextValue = {
- selectedLocation, handleLocationSelect,
- data, metadata, loading, error,
- availableDates: availableDatesToExpose,
+ selectedLocation,
+ handleLocationSelect,
+ data,
+ metadata,
+ loading,
+ error,
+ availableDates: availableDatesToExpose,
models: modelsForView,
- selectedModels, setSelectedModels: (updater) => {
- const resolveModels = (prevModels) => (
- typeof updater === 'function' ? updater(prevModels) : updater
- );
+ selectedModels,
+ setSelectedModels: (updater) => {
+ const resolveModels = (prevModels) =>
+ typeof updater === "function" ? updater(prevModels) : updater;
const currentDataset = urlManager.getDatasetFromView(viewType);
- setSelectedModels(prevModels => {
+ setSelectedModels((prevModels) => {
const nextModels = resolveModels(prevModels);
- const defaultModel = currentDataset?.defaultModel ? [currentDataset.defaultModel] : [];
- const isDefault = JSON.stringify(nextModels.slice().sort()) === JSON.stringify(defaultModel.slice().sort());
+ const defaultModel = currentDataset?.defaultModel
+ ? [currentDataset.defaultModel]
+ : [];
+ const isDefault =
+ JSON.stringify(nextModels.slice().sort()) ===
+ JSON.stringify(defaultModel.slice().sort());
updateDatasetParams({ models: isDefault ? [] : nextModels });
return nextModels;
});
},
- selectedDates, setSelectedDates: (updater) => {
- setSelectedDates(prevDates => {
- const nextDates = typeof updater === 'function' ? updater(prevDates) : updater;
+ selectedDates,
+ setSelectedDates: (updater) => {
+ setSelectedDates((prevDates) => {
+ const nextDates =
+ typeof updater === "function" ? updater(prevDates) : updater;
updateDatasetParams({ dates: nextDates });
return nextDates;
});
},
- activeDate, setActiveDate,
- viewType, setViewType: handleViewChange,
+ activeDate,
+ setActiveDate,
+ viewType,
+ setViewType: handleViewChange,
currentDataset: urlManager.getDatasetFromView(viewType),
- availableTargets: availableTargetsToExpose,
-
+ availableTargets: availableTargetsToExpose,
+
selectedTarget,
handleTargetSelect,
peaks,
- availablePeakDates: (availablePeakDates || []).filter(date => date >= CURRENT_FLU_SEASON_START),
+ availablePeakDates: (availablePeakDates || []).filter(
+ (date) => date >= CURRENT_FLU_SEASON_START,
+ ),
availablePeakModels,
chartScale,
setChartScale: setChartScaleWithUrl,
intervalVisibility,
setIntervalVisibility: setIntervalVisibilityWithUrl,
showLegend,
- setShowLegend: setShowLegendWithUrl
+ setShowLegend: setShowLegendWithUrl,
};
return (
-
- {children}
-
+
{children}
);
};
diff --git a/app/src/contexts/ViewContextObject.js b/app/src/contexts/ViewContextObject.js
index 20563544..26ed89a1 100644
--- a/app/src/contexts/ViewContextObject.js
+++ b/app/src/contexts/ViewContextObject.js
@@ -1,3 +1,3 @@
-import { createContext } from 'react';
+import { createContext } from "react";
export const ViewContext = createContext(null);
diff --git a/app/src/data/narratives/example-simple.js b/app/src/data/narratives/example-simple.js
index 24c95bb1..236984f0 100644
--- a/app/src/data/narratives/example-simple.js
+++ b/app/src/data/narratives/example-simple.js
@@ -39,4 +39,4 @@ This slide demonstrates a custom Plotly visualization showing a Gaussian distrib
- Real-time parameter adjustment
- Professional scientific plotting
-The right panel shows a beautiful Gaussian curve with customizable parameters that demonstrates how developers can embed any JavaScript visualization into RespiLens narratives.`;
\ No newline at end of file
+The right panel shows a beautiful Gaussian curve with customizable parameters that demonstrates how developers can embed any JavaScript visualization into RespiLens narratives.`;
diff --git a/app/src/data/narratives/index.js b/app/src/data/narratives/index.js
index 80af7f5f..978ca8cc 100644
--- a/app/src/data/narratives/index.js
+++ b/app/src/data/narratives/index.js
@@ -1,38 +1,43 @@
// Narrative Registry - Auto-discovers all narrative files
// This file exports metadata for all available narratives
-import { narrativeContent as exampleSimple } from './example-simple.js';
+import { narrativeContent as exampleSimple } from "./example-simple.js";
// Helper function to extract metadata from narrative content
const extractMetadata = (content, id) => {
- const parts = content.split('---');
+ const parts = content.split("---");
if (parts.length >= 3) {
- const frontmatterLines = parts[1].trim().split('\n');
+ const frontmatterLines = parts[1].trim().split("\n");
const metadata = {};
- frontmatterLines.forEach(line => {
- const [key, ...valueParts] = line.split(':');
+ frontmatterLines.forEach((line) => {
+ const [key, ...valueParts] = line.split(":");
if (key && valueParts.length > 0) {
- metadata[key.trim()] = valueParts.join(':').trim().replace(/"/g, '');
+ metadata[key.trim()] = valueParts.join(":").trim().replace(/"/g, "");
}
});
// Extract slides for counting
- const slideContent = parts.slice(2).join('---');
- const slideCount = slideContent.split(/\n# /).filter(s => s.trim()).length;
+ const slideContent = parts.slice(2).join("---");
+ const slideCount = slideContent
+ .split(/\n# /)
+ .filter((s) => s.trim()).length;
// Estimate read time (average 200 words per minute, ~100 words per slide)
const estimatedReadTime = Math.max(2, Math.ceil(slideCount * 0.5));
return {
id,
- title: metadata.title || 'Untitled Narrative',
- description: metadata.abstract || metadata.description || 'No description available',
- author: metadata.authors || metadata.author || 'Unknown Author',
- date: metadata.date || new Date().toISOString().split('T')[0],
- tags: metadata.tags ? metadata.tags.split(',').map(tag => tag.trim()) : [],
+ title: metadata.title || "Untitled Narrative",
+ description:
+ metadata.abstract || metadata.description || "No description available",
+ author: metadata.authors || metadata.author || "Unknown Author",
+ date: metadata.date || new Date().toISOString().split("T")[0],
+ tags: metadata.tags
+ ? metadata.tags.split(",").map((tag) => tag.trim())
+ : [],
readTime: `${estimatedReadTime} min`,
slideCount,
- featured: false // Default, can be overridden below
+ featured: false, // Default, can be overridden below
};
}
return null;
@@ -41,66 +46,73 @@ const extractMetadata = (content, id) => {
// Registry of all available narratives
export const narrativeRegistry = [
{
- ...extractMetadata(exampleSimple, 'example-simple'),
+ ...extractMetadata(exampleSimple, "example-simple"),
featured: true, // Mark as featured for demonstration
- tags: ['Example', 'Tutorial', 'Demo', 'Plotly', 'Custom Visualization']
- }
+ tags: ["Example", "Tutorial", "Demo", "Plotly", "Custom Visualization"],
+ },
].filter(Boolean); // Remove any null entries
// Helper to get narrative by ID
export const getNarrativeById = (id) => {
- return narrativeRegistry.find(narrative => narrative.id === id);
+ return narrativeRegistry.find((narrative) => narrative.id === id);
};
// Helper to get featured narratives
export const getFeaturedNarratives = () => {
- return narrativeRegistry.filter(narrative => narrative.featured);
+ return narrativeRegistry.filter((narrative) => narrative.featured);
};
// Helper to get regular (non-featured) narratives
export const getRegularNarratives = () => {
- return narrativeRegistry.filter(narrative => !narrative.featured);
+ return narrativeRegistry.filter((narrative) => !narrative.featured);
};
// Helper to get all unique tags
export const getAllTags = () => {
const allTags = new Set();
- narrativeRegistry.forEach(narrative => {
- narrative.tags.forEach(tag => allTags.add(tag));
+ narrativeRegistry.forEach((narrative) => {
+ narrative.tags.forEach((tag) => allTags.add(tag));
});
return Array.from(allTags).sort();
};
// Helper to search narratives
-export const searchNarratives = (searchTerm = '', filterTag = '', sortBy = 'date') => {
+export const searchNarratives = (
+ searchTerm = "",
+ filterTag = "",
+ sortBy = "date",
+) => {
let filtered = narrativeRegistry;
// Apply search filter
if (searchTerm) {
const term = searchTerm.toLowerCase();
- filtered = filtered.filter(narrative =>
- narrative.title.toLowerCase().includes(term) ||
- narrative.description.toLowerCase().includes(term) ||
- narrative.author.toLowerCase().includes(term) ||
- narrative.tags.some(tag => tag.toLowerCase().includes(term))
+ filtered = filtered.filter(
+ (narrative) =>
+ narrative.title.toLowerCase().includes(term) ||
+ narrative.description.toLowerCase().includes(term) ||
+ narrative.author.toLowerCase().includes(term) ||
+ narrative.tags.some((tag) => tag.toLowerCase().includes(term)),
);
}
// Apply tag filter
if (filterTag) {
- filtered = filtered.filter(narrative => narrative.tags.includes(filterTag));
+ filtered = filtered.filter((narrative) =>
+ narrative.tags.includes(filterTag),
+ );
}
// Apply sorting
filtered.sort((a, b) => {
switch (sortBy) {
- case 'date':
+ case "date":
return new Date(b.date) - new Date(a.date);
- case 'title':
+ case "title":
return a.title.localeCompare(b.title);
- case 'author':
+ case "author":
return a.author.localeCompare(b.author);
- case 'readTime':
+ case "readTime":
return parseInt(a.readTime) - parseInt(b.readTime);
default:
return 0;
@@ -110,4 +122,4 @@ export const searchNarratives = (searchTerm = '', filterTag = '', sortBy = 'date
return filtered;
};
-export default narrativeRegistry;
\ No newline at end of file
+export default narrativeRegistry;
diff --git a/app/src/hooks/useAdaptiveYRange.js b/app/src/hooks/useAdaptiveYRange.js
index d3bfd0cd..d0feb7f5 100644
--- a/app/src/hooks/useAdaptiveYRange.js
+++ b/app/src/hooks/useAdaptiveYRange.js
@@ -1,9 +1,9 @@
-import { useCallback } from 'react';
+import { useCallback } from "react";
/**
* Custom hook for calculating adaptive y-axis range based on visible data
* Works across FluSight, RSV, and NHSN datasets
- *
+ *
* @param {Object} data - Dataset containing ground truth and/or forecasts
* @param {Array} selectedDates - Currently selected forecast dates
* @param {Array} selectedModels - Currently selected models
@@ -17,31 +17,31 @@ import { useCallback } from 'react';
* @returns {Function} Function that calculates adaptive y-range
*/
export const useAdaptiveYRange = (
- data,
- selectedDates,
- selectedModels,
+ data,
+ selectedDates,
+ selectedModels,
getDefaultRange,
- options = {}
+ options = {},
) => {
const {
- datasetType = 'flu',
- ageGroup = '0-130',
- target = 'inc hosp',
+ datasetType = "flu",
+ ageGroup = "0-130",
+ target = "inc hosp",
paddingPercent = 10,
includeGroundTruth = true,
- selectedColumns = []
+ selectedColumns = [],
} = options;
return useCallback(() => {
if (!data) return null;
-
+
// Get current x-axis range to determine visible time period
const currentXRange = getDefaultRange();
if (!currentXRange) return null;
-
+
const [startDate, endDate] = currentXRange;
const allYValues = [];
-
+
// Add ground truth values if available and requested
if (includeGroundTruth && data.ground_truth) {
const addGroundTruthValues = (dates, values) => {
@@ -49,7 +49,7 @@ export const useAdaptiveYRange = (
dates.forEach((date, index) => {
if (date >= startDate && date <= endDate) {
const value = values[index];
- if (typeof value === 'number' && !isNaN(value)) {
+ if (typeof value === "number" && !isNaN(value)) {
allYValues.push(value);
}
}
@@ -57,96 +57,106 @@ export const useAdaptiveYRange = (
};
switch (datasetType) {
- case 'flu':
- addGroundTruthValues(data.ground_truth.dates, data.ground_truth.values);
+ case "flu":
+ addGroundTruthValues(
+ data.ground_truth.dates,
+ data.ground_truth.values,
+ );
break;
- case 'rsv':
+ case "rsv":
// RSV has age-group specific ground truth
if (data.ground_truth[ageGroup]) {
addGroundTruthValues(
- data.ground_truth[ageGroup].dates,
- data.ground_truth[ageGroup].values
+ data.ground_truth[ageGroup].dates,
+ data.ground_truth[ageGroup].values,
);
}
break;
- case 'nhsn':
+ case "nhsn":
// NHSN uses data.ground_truth structure (no forecasts)
- addGroundTruthValues(data.ground_truth.dates, data.ground_truth.values);
+ addGroundTruthValues(
+ data.ground_truth.dates,
+ data.ground_truth.values,
+ );
break;
}
}
-
+
// Add forecast values from selected models and dates (skip for NHSN - no forecasts)
- if (datasetType !== 'nhsn') {
- selectedModels.forEach(model => {
- selectedDates.forEach(date => {
+ if (datasetType !== "nhsn") {
+ selectedModels.forEach((model) => {
+ selectedDates.forEach((date) => {
const forecasts = data.forecasts[date] || {};
let forecast = null;
-
+
// Get forecast data based on dataset type
switch (datasetType) {
- case 'flu':
- forecast =
- forecasts['wk inc flu hosp']?.[model] ||
- forecasts['wk flu hosp rate change']?.[model];
+ case "flu":
+ forecast =
+ forecasts["wk inc flu hosp"]?.[model] ||
+ forecasts["wk flu hosp rate change"]?.[model];
break;
- case 'rsv':
+ case "rsv":
forecast = forecasts[ageGroup]?.[target]?.[model];
break;
}
-
+
if (!forecast) return;
-
+
// Handle quantile predictions
- if (forecast.type === 'quantile') {
+ if (forecast.type === "quantile") {
Object.entries(forecast.predictions || {}).forEach(([, pred]) => {
if (pred.date >= startDate && pred.date <= endDate) {
const values = pred.values || [];
const quantiles = pred.quantiles || [];
-
+
// Include key quantiles for range calculation
- [0.025, 0.25, 0.5, 0.75, 0.975].forEach(q => {
+ [0.025, 0.25, 0.5, 0.75, 0.975].forEach((q) => {
const index = quantiles.indexOf(q);
- if (index !== -1 && typeof values[index] === 'number' && !isNaN(values[index])) {
+ if (
+ index !== -1 &&
+ typeof values[index] === "number" &&
+ !isNaN(values[index])
+ ) {
allYValues.push(values[index]);
}
});
}
});
}
-
+
// Handle sample predictions
- if (forecast.type === 'sample') {
+ if (forecast.type === "sample") {
Object.entries(forecast.predictions || {}).forEach(([, pred]) => {
if (pred.date >= startDate && pred.date <= endDate) {
const samples = pred.samples || [];
- samples.forEach(sample => {
- if (typeof sample === 'number' && !isNaN(sample)) {
+ samples.forEach((sample) => {
+ if (typeof sample === "number" && !isNaN(sample)) {
allYValues.push(sample);
}
});
}
});
}
-
+
// Handle PMF predictions (rate change) - not typically used for y-axis scaling
// but included for completeness
});
});
}
-
+
// For NHSN, add values from selected columns
- if (datasetType === 'nhsn' && selectedColumns) {
- selectedColumns.forEach(column => {
+ if (datasetType === "nhsn" && selectedColumns) {
+ selectedColumns.forEach((column) => {
// Determine if column is preliminary or official
- const isPrelimininary = column.includes('_prelim');
- const dataType = isPrelimininary ? 'preliminary' : 'official';
-
+ const isPrelimininary = column.includes("_prelim");
+ const dataType = isPrelimininary ? "preliminary" : "official";
+
if (data.data?.[dataType]?.[column]) {
data.ground_truth.dates.forEach((date, index) => {
if (date >= startDate && date <= endDate) {
const value = data.data[dataType][column][index];
- if (typeof value === 'number' && !isNaN(value)) {
+ if (typeof value === "number" && !isNaN(value)) {
allYValues.push(value);
}
}
@@ -154,27 +164,35 @@ export const useAdaptiveYRange = (
}
});
}
-
+
// For Flu, ensure we have forecast data even with no selected dates
- if (datasetType === 'flu' && selectedDates.length === 0 && selectedModels.length > 0) {
+ if (
+ datasetType === "flu" &&
+ selectedDates.length === 0 &&
+ selectedModels.length > 0
+ ) {
// Use all available forecast dates when none specifically selected
const allForecastDates = Object.keys(data.forecasts || {});
- allForecastDates.forEach(date => {
- selectedModels.forEach(model => {
+ allForecastDates.forEach((date) => {
+ selectedModels.forEach((model) => {
const forecasts = data.forecasts[date] || {};
- const forecast =
- forecasts['wk inc flu hosp']?.[model] ||
- forecasts['wk flu hosp rate change']?.[model];
-
- if (forecast && forecast.type === 'quantile') {
+ const forecast =
+ forecasts["wk inc flu hosp"]?.[model] ||
+ forecasts["wk flu hosp rate change"]?.[model];
+
+ if (forecast && forecast.type === "quantile") {
Object.entries(forecast.predictions || {}).forEach(([, pred]) => {
if (pred.date >= startDate && pred.date <= endDate) {
const values = pred.values || [];
const quantiles = pred.quantiles || [];
-
- [0.025, 0.25, 0.5, 0.75, 0.975].forEach(q => {
+
+ [0.025, 0.25, 0.5, 0.75, 0.975].forEach((q) => {
const index = quantiles.indexOf(q);
- if (index !== -1 && typeof values[index] === 'number' && !isNaN(values[index])) {
+ if (
+ index !== -1 &&
+ typeof values[index] === "number" &&
+ !isNaN(values[index])
+ ) {
allYValues.push(values[index]);
}
});
@@ -184,39 +202,43 @@ export const useAdaptiveYRange = (
});
});
}
-
+
if (allYValues.length === 0) {
// Return a sensible default range if no data found
return [0, 100];
}
-
+
const minVal = Math.min(...allYValues);
const maxVal = Math.max(...allYValues);
-
+
// Handle edge case where min === max
if (minVal === maxVal) {
const baseValue = Math.max(minVal, 1);
return [0, baseValue * 2];
}
-
+
// Add padding to prevent data from touching axis edges
const range = maxVal - minVal;
- const padding = Math.max(range * (paddingPercent / 100), Math.abs(maxVal) * 0.05, 1);
-
+ const padding = Math.max(
+ range * (paddingPercent / 100),
+ Math.abs(maxVal) * 0.05,
+ 1,
+ );
+
return [
0, // Always start from 0 for count data
- maxVal + padding
+ maxVal + padding,
];
}, [
- data,
- selectedDates,
- selectedModels,
+ data,
+ selectedDates,
+ selectedModels,
getDefaultRange,
datasetType,
ageGroup,
target,
paddingPercent,
includeGroundTruth,
- selectedColumns
+ selectedColumns,
]);
};
diff --git a/app/src/hooks/useForecastData.js b/app/src/hooks/useForecastData.js
index 85743a8b..25d9922a 100644
--- a/app/src/hooks/useForecastData.js
+++ b/app/src/hooks/useForecastData.js
@@ -1,5 +1,5 @@
-import { useState, useEffect } from 'react';
-import { getDataPath } from '../utils/paths';
+import { useState, useEffect } from "react";
+import { getDataPath } from "../utils/paths";
export const useForecastData = (location, viewType) => {
const [data, setData] = useState(null);
@@ -16,13 +16,16 @@ export const useForecastData = (location, viewType) => {
const peaks = data?.peaks || null;
useEffect(() => {
- const isMetrocastView = viewType === 'metrocast_forecasts';
- const isDefaultUS = location === 'US';
- if ((isMetrocastView && isDefaultUS) || (!isMetrocastView && location === 'colorado')) {
- setLoading(false);
- return;
- }
- if (!location || !viewType || viewType === 'frontpage') {
+ const isMetrocastView = viewType === "metrocast_forecasts";
+ const isDefaultUS = location === "US";
+ if (
+ (isMetrocastView && isDefaultUS) ||
+ (!isMetrocastView && location === "colorado")
+ ) {
+ setLoading(false);
+ return;
+ }
+ if (!location || !viewType || viewType === "frontpage") {
setLoading(false);
setError(null);
setData(null);
@@ -43,28 +46,42 @@ export const useForecastData = (location, viewType) => {
try {
const datasetMap = {
- 'fludetailed': { directory: 'flusight', suffix: 'flu' },
- 'flu_forecasts': { directory: 'flusight', suffix: 'flu' },
- 'flu_peak': { directory: 'flusight', suffix: 'flu' },
- 'covid_forecasts': { directory: 'covid19forecasthub', suffix: 'covid19' },
- 'rsv_forecasts': { directory: 'rsvforecasthub', suffix: 'rsv' },
- 'nhsnall': { directory: 'nhsn', suffix: 'nhsn' },
- 'metrocast_forecasts': {directory: 'flumetrocast', suffix: 'flu_metrocast'}
+ fludetailed: { directory: "flusight", suffix: "flu" },
+ flu_forecasts: { directory: "flusight", suffix: "flu" },
+ flu_peak: { directory: "flusight", suffix: "flu" },
+ covid_forecasts: {
+ directory: "covid19forecasthub",
+ suffix: "covid19",
+ },
+ rsv_forecasts: { directory: "rsvforecasthub", suffix: "rsv" },
+ nhsnall: { directory: "nhsn", suffix: "nhsn" },
+ metrocast_forecasts: {
+ directory: "flumetrocast",
+ suffix: "flu_metrocast",
+ },
};
const datasetConfig = datasetMap[viewType];
if (!datasetConfig) throw new Error(`Unknown view type: ${viewType}`);
- const dataPath = getDataPath(`${datasetConfig.directory}/${location}_${datasetConfig.suffix}.json`);
- const metadataPath = getDataPath(`${datasetConfig.directory}/metadata.json`);
-
+ const dataPath = getDataPath(
+ `${datasetConfig.directory}/${location}_${datasetConfig.suffix}.json`,
+ );
+ const metadataPath = getDataPath(
+ `${datasetConfig.directory}/metadata.json`,
+ );
+
const [dataResponse, metadataResponse] = await Promise.all([
fetch(dataPath),
- fetch(metadataPath)
+ fetch(metadataPath),
]);
- if (!dataResponse.ok) throw new Error(`Failed to fetch data: ${dataResponse.status}`);
- if (!metadataResponse.ok) throw new Error(`Failed to fetch metadata: ${metadataResponse.status}`);
+ if (!dataResponse.ok)
+ throw new Error(`Failed to fetch data: ${dataResponse.status}`);
+ if (!metadataResponse.ok)
+ throw new Error(
+ `Failed to fetch metadata: ${metadataResponse.status}`,
+ );
const jsonData = await dataResponse.json();
const jsonMetadata = await metadataResponse.json();
@@ -75,11 +92,11 @@ export const useForecastData = (location, viewType) => {
if (jsonData.forecasts) {
const dates = Object.keys(jsonData.forecasts).sort();
setAvailableDates(dates);
-
+
const modelSet = new Set();
- Object.values(jsonData.forecasts).forEach(dateData => {
- Object.values(dateData).forEach(targetData => {
- Object.keys(targetData).forEach(model => modelSet.add(model));
+ Object.values(jsonData.forecasts).forEach((dateData) => {
+ Object.values(dateData).forEach((targetData) => {
+ Object.keys(targetData).forEach((model) => modelSet.add(model));
});
});
setModels(Array.from(modelSet).sort());
@@ -88,37 +105,37 @@ export const useForecastData = (location, viewType) => {
// if flu, rsv, or covid data: // loop through JSON data to get model lists by target (for dynamic model selection)
if (jsonData.forecasts) {
const modelsByTargetMap = new Map();
-
- Object.values(jsonData.forecasts).forEach(dateData => {
- // Loop over [target, targetData] entries
- Object.entries(dateData).forEach(([target, targetData]) => {
-
- if (!modelsByTargetMap.has(target)) {
- modelsByTargetMap.set(target, new Set());
- }
- const modelSetForTarget = modelsByTargetMap.get(target);
-
- Object.keys(targetData).forEach(model => {
- modelSetForTarget.add(model);
- });
+
+ Object.values(jsonData.forecasts).forEach((dateData) => {
+ // Loop over [target, targetData] entries
+ Object.entries(dateData).forEach(([target, targetData]) => {
+ if (!modelsByTargetMap.has(target)) {
+ modelsByTargetMap.set(target, new Set());
+ }
+ const modelSetForTarget = modelsByTargetMap.get(target);
+
+ Object.keys(targetData).forEach((model) => {
+ modelSetForTarget.add(model);
});
});
+ });
- const modelsByTargetState = {};
- for (const [target, modelSet] of modelsByTargetMap.entries()) {
- modelsByTargetState[target] = Array.from(modelSet).sort();
- }
- setModelsByTarget(modelsByTargetState);
+ const modelsByTargetState = {};
+ for (const [target, modelSet] of modelsByTargetMap.entries()) {
+ modelsByTargetState[target] = Array.from(modelSet).sort();
}
+ setModelsByTarget(modelsByTargetState);
+ }
let targets = [];
if (jsonData?.ground_truth) {
- targets = Object.keys(jsonData.ground_truth).filter(key => key !== 'dates');
+ targets = Object.keys(jsonData.ground_truth).filter(
+ (key) => key !== "dates",
+ );
}
setAvailableTargets(targets);
-
} catch (err) {
- console.error('Error fetching forecast data:', err);
+ console.error("Error fetching forecast data:", err);
setError(err.message);
} finally {
setLoading(false);
@@ -129,29 +146,40 @@ export const useForecastData = (location, viewType) => {
}, [location, viewType]);
useEffect(() => {
- if (!peaks || typeof peaks !== 'object') {
- setAvailablePeakDates([]);
- setAvailablePeakModels([]);
- return;
- }
-
- const dates = Object.keys(peaks).sort();
- setAvailablePeakDates(dates);
-
- const models = new Set();
- const targets = new Set();
- Object.values(peaks).forEach(dateData => {
- Object.entries(dateData).forEach(([targetName, targetData]) => {
- targets.add(targetName);
- Object.keys(targetData).forEach(modelId => {
- models.add(modelId);
- });
- });
- });
- setAvailablePeakModels(Array.from(models).sort());
- // setAvailablePeakTargets(Array.from(targets).sort());, leave this for now
-
- }, [peaks]);
+ if (!peaks || typeof peaks !== "object") {
+ setAvailablePeakDates([]);
+ setAvailablePeakModels([]);
+ return;
+ }
- return { data, metadata, loading, error, availableDates, models, availableTargets, modelsByTarget, peaks, availablePeakDates, availablePeakModels };
+ const dates = Object.keys(peaks).sort();
+ setAvailablePeakDates(dates);
+
+ const models = new Set();
+ const targets = new Set();
+ Object.values(peaks).forEach((dateData) => {
+ Object.entries(dateData).forEach(([targetName, targetData]) => {
+ targets.add(targetName);
+ Object.keys(targetData).forEach((modelId) => {
+ models.add(modelId);
+ });
+ });
+ });
+ setAvailablePeakModels(Array.from(models).sort());
+ // setAvailablePeakTargets(Array.from(targets).sort());, leave this for now
+ }, [peaks]);
+
+ return {
+ data,
+ metadata,
+ loading,
+ error,
+ availableDates,
+ models,
+ availableTargets,
+ modelsByTarget,
+ peaks,
+ availablePeakDates,
+ availablePeakModels,
+ };
};
diff --git a/app/src/hooks/useForecastleScenario.js b/app/src/hooks/useForecastleScenario.js
index 3beda8a2..e5df6a95 100644
--- a/app/src/hooks/useForecastleScenario.js
+++ b/app/src/hooks/useForecastleScenario.js
@@ -1,28 +1,28 @@
-import { useEffect, useMemo, useState } from 'react';
-import { FORECASTLE_CONFIG } from '../config';
+import { useEffect, useMemo, useState } from "react";
+import { FORECASTLE_CONFIG } from "../config";
const DATASET_DEFINITIONS = [
{
- key: 'flusight',
- label: 'Influenza Hospitalizations (FluSight)',
- dataPath: 'flusight',
- fileSuffix: 'flu.json',
+ key: "flusight",
+ label: "Influenza Hospitalizations (FluSight)",
+ dataPath: "flusight",
+ fileSuffix: "flu.json",
targetKey: FORECASTLE_CONFIG.targetKeys.flusight,
defaultHorizons: FORECASTLE_CONFIG.horizons.flusight,
},
{
- key: 'rsv',
- label: 'RSV Hospitalizations (RSV Forecast Hub)',
- dataPath: 'rsvforecasthub',
- fileSuffix: 'rsv.json',
+ key: "rsv",
+ label: "RSV Hospitalizations (RSV Forecast Hub)",
+ dataPath: "rsvforecasthub",
+ fileSuffix: "rsv.json",
targetKey: FORECASTLE_CONFIG.targetKeys.rsv,
defaultHorizons: FORECASTLE_CONFIG.horizons.rsv,
},
{
- key: 'covid19',
- label: 'COVID-19 Hospitalizations (COVID-19 Forecast Hub)',
- dataPath: 'covid19forecasthub',
- fileSuffix: 'covid19.json',
+ key: "covid19",
+ label: "COVID-19 Hospitalizations (COVID-19 Forecast Hub)",
+ dataPath: "covid19forecasthub",
+ fileSuffix: "covid19.json",
targetKey: FORECASTLE_CONFIG.targetKeys.covid19,
defaultHorizons: FORECASTLE_CONFIG.horizons.covid19,
},
@@ -53,17 +53,19 @@ const pickDeterministic = (items, rng) => {
const fetchJson = async (path) => {
const response = await fetch(path);
if (!response.ok) {
- throw new Error(`Failed to fetch ${path}: ${response.status} ${response.statusText}`);
+ throw new Error(
+ `Failed to fetch ${path}: ${response.status} ${response.statusText}`,
+ );
}
return response.json();
};
const getEasternDateKey = () => {
- const formatter = new Intl.DateTimeFormat('en-CA', {
- timeZone: 'America/New_York',
- year: 'numeric',
- month: '2-digit',
- day: '2-digit',
+ const formatter = new Intl.DateTimeFormat("en-CA", {
+ timeZone: "America/New_York",
+ year: "numeric",
+ month: "2-digit",
+ day: "2-digit",
});
return formatter.format(new Date());
};
@@ -110,12 +112,16 @@ const countModelsForTarget = (targetForecasts) => {
// We only consider forecast dates/locations that contain the required
// target and horizons so the user always receives a fully-specified task.
const ensureValidScenario = async (rng, datasetMeta) => {
- const locationOptions = datasetMeta.metadata?.locations?.filter((loc) => loc?.abbreviation) || [];
+ const locationOptions =
+ datasetMeta.metadata?.locations?.filter((loc) => loc?.abbreviation) || [];
if (locationOptions.length === 0) {
return null;
}
- const attemptLimit = Math.min(20, locationOptions.length * FORECASTLE_CONFIG.maxAttemptMultiplier);
+ const attemptLimit = Math.min(
+ 20,
+ locationOptions.length * FORECASTLE_CONFIG.maxAttemptMultiplier,
+ );
for (let attempt = 0; attempt < attemptLimit; attempt += 1) {
const location = pickDeterministic(locationOptions, rng);
@@ -139,7 +145,8 @@ const ensureValidScenario = async (rng, datasetMeta) => {
// Prepare ground truth lookup
const groundTruthDates = locationData.ground_truth?.dates || [];
- const groundTruthValues = locationData.ground_truth?.[datasetMeta.definition.targetKey] || [];
+ const groundTruthValues =
+ locationData.ground_truth?.[datasetMeta.definition.targetKey] || [];
const groundTruthMap = new Map();
groundTruthDates.forEach((date, index) => {
const value = groundTruthValues[index];
@@ -148,47 +155,58 @@ const ensureValidScenario = async (rng, datasetMeta) => {
}
});
- const validForecasts = forecastsEntries.filter(([forecastDate, targets]) => {
- const targetForecasts = targets?.[datasetMeta.definition.targetKey];
+ const validForecasts = forecastsEntries.filter(
+ ([forecastDate, targets]) => {
+ const targetForecasts = targets?.[datasetMeta.definition.targetKey];
- // Check if there are at least the minimum required models
- const modelCount = countModelsForTarget(targetForecasts);
- if (modelCount < FORECASTLE_CONFIG.minModelsRequired) {
- return false;
- }
+ // Check if there are at least the minimum required models
+ const modelCount = countModelsForTarget(targetForecasts);
+ if (modelCount < FORECASTLE_CONFIG.minModelsRequired) {
+ return false;
+ }
- const horizonSet = extractPositiveHorizons(targets, datasetMeta.definition.targetKey);
- if (horizonSet.size === 0) {
- return false;
- }
- const requiredHorizons = datasetMeta.requiredHorizons;
+ const horizonSet = extractPositiveHorizons(
+ targets,
+ datasetMeta.definition.targetKey,
+ );
+ if (horizonSet.size === 0) {
+ return false;
+ }
+ const requiredHorizons = datasetMeta.requiredHorizons;
- // Check if all required horizons are present
- if (!requiredHorizons.every((horizon) => horizonSet.has(horizon))) {
- return false;
- }
+ // Check if all required horizons are present
+ if (!requiredHorizons.every((horizon) => horizonSet.has(horizon))) {
+ return false;
+ }
- // Check if ground truth is available for all required horizons
- const allHorizonsHaveGroundTruth = requiredHorizons.every((horizon) => {
- const horizonDate = addWeeksToDate(forecastDate, horizon);
- if (!horizonDate) return false;
- return groundTruthMap.has(horizonDate);
- });
+ // Check if ground truth is available for all required horizons
+ const allHorizonsHaveGroundTruth = requiredHorizons.every((horizon) => {
+ const horizonDate = addWeeksToDate(forecastDate, horizon);
+ if (!horizonDate) return false;
+ return groundTruthMap.has(horizonDate);
+ });
- return allHorizonsHaveGroundTruth;
- });
+ return allHorizonsHaveGroundTruth;
+ },
+ );
if (validForecasts.length === 0) {
continue;
}
- const [forecastDate, forecastTargets] = pickDeterministic(validForecasts, rng) || [];
+ const [forecastDate, forecastTargets] =
+ pickDeterministic(validForecasts, rng) || [];
if (!forecastDate || !forecastTargets) {
continue;
}
- const horizonSet = extractPositiveHorizons(forecastTargets, datasetMeta.definition.targetKey);
- const availableHorizons = Array.from(horizonSet.values()).sort((a, b) => a - b);
+ const horizonSet = extractPositiveHorizons(
+ forecastTargets,
+ datasetMeta.definition.targetKey,
+ );
+ const availableHorizons = Array.from(horizonSet.values()).sort(
+ (a, b) => a - b,
+ );
// Reuse groundTruthDates and groundTruthValues from earlier in the function
const groundTruthSeries = groundTruthDates.map((date, index) => ({
@@ -196,7 +214,9 @@ const ensureValidScenario = async (rng, datasetMeta) => {
value: groundTruthValues[index] ?? null,
}));
- const filteredSeries = groundTruthSeries.filter((entry) => entry.value !== null);
+ const filteredSeries = groundTruthSeries.filter(
+ (entry) => entry.value !== null,
+ );
// Keep the full series for scoring (including future ground truth)
const fullGroundTruthSeries = filteredSeries;
@@ -211,9 +231,11 @@ const ensureValidScenario = async (rng, datasetMeta) => {
// Determine how much history to show based on dataset type
let recentSeries;
- const historyConfig = FORECASTLE_CONFIG.historyDisplay[datasetMeta.definition.key] || FORECASTLE_CONFIG.historyDisplay.default;
+ const historyConfig =
+ FORECASTLE_CONFIG.historyDisplay[datasetMeta.definition.key] ||
+ FORECASTLE_CONFIG.historyDisplay.default;
- if (historyConfig === 'seasonStart') {
+ if (historyConfig === "seasonStart") {
// Show since start of season (approximately July 1st)
const forecastDateObj = new Date(forecastDate);
const year = forecastDateObj.getFullYear();
@@ -256,7 +278,10 @@ export const useForecastleScenario = (playDate = null) => {
const [error, setError] = useState(null);
// Use playDate if provided, otherwise use today's date
- const challengeDateKey = useMemo(() => playDate || getEasternDateKey(), [playDate]);
+ const challengeDateKey = useMemo(
+ () => playDate || getEasternDateKey(),
+ [playDate],
+ );
useEffect(() => {
let isCancelled = false;
@@ -270,13 +295,22 @@ export const useForecastleScenario = (playDate = null) => {
try {
const datasetMetas = await Promise.all(
DATASET_DEFINITIONS.map(async (definition) => {
- const metadata = await fetchJson(`/processed_data/${definition.dataPath}/metadata.json`);
- const horizonSet = toNumberSet(metadata?.hubverse_keys?.horizons || []);
- const requiredHorizons = definition.defaultHorizons.filter((horizon) => horizonSet.has(horizon));
+ const metadata = await fetchJson(
+ `/processed_data/${definition.dataPath}/metadata.json`,
+ );
+ const horizonSet = toNumberSet(
+ metadata?.hubverse_keys?.horizons || [],
+ );
+ const requiredHorizons = definition.defaultHorizons.filter(
+ (horizon) => horizonSet.has(horizon),
+ );
return {
definition,
metadata,
- requiredHorizons: requiredHorizons.length > 0 ? requiredHorizons : definition.defaultHorizons,
+ requiredHorizons:
+ requiredHorizons.length > 0
+ ? requiredHorizons
+ : definition.defaultHorizons,
};
}),
);
@@ -285,8 +319,14 @@ export const useForecastleScenario = (playDate = null) => {
const resolvedScenarios = [];
const maxScenarios = FORECASTLE_CONFIG.maxScenariosPerDay;
- for (let scenarioIndex = 0; scenarioIndex < maxScenarios; scenarioIndex += 1) {
- const seed = hashString(`forecastle-${challengeDateKey}-${scenarioIndex}`);
+ for (
+ let scenarioIndex = 0;
+ scenarioIndex < maxScenarios;
+ scenarioIndex += 1
+ ) {
+ const seed = hashString(
+ `forecastle-${challengeDateKey}-${scenarioIndex}`,
+ );
const rng = createRng(seed);
const attemptOrder = [...datasetMetas].sort(() => rng() - 0.5);
@@ -322,7 +362,9 @@ export const useForecastleScenario = (playDate = null) => {
}
if (resolvedScenarios.length === 0) {
- throw new Error('Unable to generate any Forecastle scenarios for today.');
+ throw new Error(
+ "Unable to generate any Forecastle scenarios for today.",
+ );
}
if (!isCancelled) {
@@ -331,8 +373,12 @@ export const useForecastleScenario = (playDate = null) => {
}
} catch (err) {
if (!isCancelled) {
- console.error('Forecastle scenario error', err);
- setError(err instanceof Error ? err : new Error('Unknown error generating scenario'));
+ console.error("Forecastle scenario error", err);
+ setError(
+ err instanceof Error
+ ? err
+ : new Error("Unknown error generating scenario"),
+ );
setLoading(false);
}
}
diff --git a/app/src/hooks/useOverviewPlot.js b/app/src/hooks/useOverviewPlot.js
index 5be1271f..accf0770 100644
--- a/app/src/hooks/useOverviewPlot.js
+++ b/app/src/hooks/useOverviewPlot.js
@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { useMemo } from "react";
const DEFAULT_MARGIN = { l: 40, r: 20, t: 40, b: 40 };
@@ -32,12 +32,13 @@ const useOverviewPlot = ({
layoutDefaults = null,
}) => {
const traces = useMemo(() => {
- if (!data || typeof buildTraces !== 'function') return [];
+ if (!data || typeof buildTraces !== "function") return [];
return buildTraces(data) || [];
}, [data, buildTraces]);
const yRange = useMemo(() => {
- if (!xRange || !Array.isArray(xRange) || xRange.length !== 2) return undefined;
+ if (!xRange || !Array.isArray(xRange) || xRange.length !== 2)
+ return undefined;
const [rangeStart, rangeEnd] = xRange;
if (!isValidDate(rangeStart) || !isValidDate(rangeEnd)) return undefined;
@@ -64,7 +65,10 @@ const useOverviewPlot = ({
const spread = maxY - minY;
const paddingTop = spread * yPaddingTopRatio;
const paddingBottom = spread * yPaddingBottomRatio;
- const paddedMin = yMinFloor === null ? minY - paddingBottom : Math.max(yMinFloor, minY - paddingBottom);
+ const paddedMin =
+ yMinFloor === null
+ ? minY - paddingBottom
+ : Math.max(yMinFloor, minY - paddingBottom);
const paddedMax = maxY + paddingTop;
return [paddedMin, paddedMax];
@@ -74,22 +78,24 @@ const useOverviewPlot = ({
const baseLayout = {
autosize: true,
margin: DEFAULT_MARGIN,
- title: { text: '', font: { size: 13 } },
+ title: { text: "", font: { size: 13 } },
xaxis: {
range: xRange || undefined,
showgrid: false,
- tickfont: { size: 10 }
+ tickfont: { size: 10 },
},
yaxis: {
automargin: true,
tickfont: { size: 10 },
- range: yRange
+ range: yRange,
},
showlegend: false,
- hovermode: 'x unified'
+ hovermode: "x unified",
};
- const mergedLayout = layoutDefaults ? { ...baseLayout, ...layoutDefaults } : baseLayout;
+ const mergedLayout = layoutDefaults
+ ? { ...baseLayout, ...layoutDefaults }
+ : baseLayout;
if (layoutOverrides) {
return layoutOverrides(mergedLayout, { traces, xRange, yRange });
diff --git a/app/src/hooks/useQuantileForecastTraces.js b/app/src/hooks/useQuantileForecastTraces.js
index df3d9fcf..b3b0411e 100644
--- a/app/src/hooks/useQuantileForecastTraces.js
+++ b/app/src/hooks/useQuantileForecastTraces.js
@@ -1,7 +1,8 @@
-import { useMemo } from 'react';
-import { MODEL_COLORS } from '../config/datasets';
+import { useMemo } from "react";
+import { MODEL_COLORS } from "../config/datasets";
-const defaultFormatValue = (value) => value.toLocaleString(undefined, { maximumFractionDigits: 2 });
+const defaultFormatValue = (value) =>
+ value.toLocaleString(undefined, { maximumFractionDigits: 2 });
const buildDefaultModelHoverText = ({
model,
@@ -12,12 +13,12 @@ const buildDefaultModelHoverText = ({
issuedDate,
valueSuffix,
show50,
- show95
+ show95,
}) => {
const rows = [
`
${model} ` +
- `Date: ${pointDate}
` +
- `Median:
${formattedMedian}${valueSuffix} `
+ `Date: ${pointDate}
` +
+ `Median:
${formattedMedian}${valueSuffix} `,
];
if (show50) {
@@ -30,10 +31,10 @@ const buildDefaultModelHoverText = ({
rows.push(
`
predicted as of ${issuedDate} ` +
- `
`
+ `
`,
);
- return rows.join('');
+ return rows.join("");
};
const resolveModelColor = (selectedModels, model) => {
@@ -47,9 +48,9 @@ const useQuantileForecastTraces = ({
selectedDates,
selectedModels,
target,
- groundTruthLabel = 'Observed',
- groundTruthValueFormat = '%{y}',
- valueSuffix = '',
+ groundTruthLabel = "Observed",
+ groundTruthValueFormat = "%{y}",
+ valueSuffix = "",
formatValue = defaultFormatValue,
modelHoverBuilder = null,
modelColorFn = null,
@@ -63,247 +64,258 @@ const useQuantileForecastTraces = ({
show50 = true,
show95 = true,
transformY = null,
- groundTruthHoverFormatter = null
-}) => useMemo(() => {
- if (!groundTruth || !forecasts || selectedDates.length === 0 || !target) {
- return { traces: [], rawYRange: null };
- }
+ groundTruthHoverFormatter = null,
+}) =>
+ useMemo(() => {
+ if (!groundTruth || !forecasts || selectedDates.length === 0 || !target) {
+ return { traces: [], rawYRange: null };
+ }
+
+ const groundTruthValues = groundTruth[target];
+ if (!groundTruthValues) {
+ console.warn(`Ground truth data not found for target: ${target}`);
+ return { traces: [], rawYRange: null };
+ }
+
+ let rawMin = Infinity;
+ let rawMax = -Infinity;
+ const updateRange = (value) => {
+ if (value === null || value === undefined) return;
+ const numeric = Number(value);
+ if (Number.isNaN(numeric)) return;
+ rawMin = Math.min(rawMin, numeric);
+ rawMax = Math.max(rawMax, numeric);
+ };
+
+ groundTruthValues.forEach((value) => updateRange(value));
+
+ const groundTruthY = transformY
+ ? groundTruthValues.map((value) => transformY(value))
+ : groundTruthValues;
+
+ const groundTruthTrace = {
+ x: groundTruth.dates || [],
+ y: groundTruthY,
+ name: groundTruthLabel,
+ type: "scatter",
+ mode: showMedian ? "lines+markers" : "lines",
+ line: { color: "black", width: groundTruthLineWidth, dash: "dash" },
+ marker: { size: groundTruthMarkerSize, color: "black" },
+ };
+
+ if (groundTruthHoverFormatter) {
+ groundTruthTrace.text = groundTruthValues.map((value) =>
+ groundTruthHoverFormatter(value),
+ );
+ groundTruthTrace.hovertemplate = `
${groundTruthLabel} Date: %{x}
Value:
%{text}${valueSuffix} `;
+ } else {
+ groundTruthTrace.hovertemplate = `
${groundTruthLabel} Date: %{x}
Value:
${groundTruthValueFormat}${valueSuffix} `;
+ }
+
+ const modelTraces = selectedModels.flatMap((model) =>
+ selectedDates.flatMap((date, dateIndex) => {
+ const forecastsForDate = forecasts[date] || {};
+ const forecast = forecastsForDate[target]?.[model];
+ if (!forecast || forecast.type !== "quantile") return [];
+
+ const forecastDates = [];
+ const medianValues = [];
+ const ci95Upper = [];
+ const ci95Lower = [];
+ const ci50Upper = [];
+ const ci50Lower = [];
+ const hoverTexts = [];
+
+ const sortedPredictions = Object.values(
+ forecast.predictions || {},
+ ).sort((a, b) => new Date(a.date) - new Date(b.date));
+
+ sortedPredictions.forEach((pred) => {
+ const pointDate = pred.date;
+ const { quantiles = [], values = [] } = pred;
+
+ const findValue = (q) => {
+ const index = quantiles.indexOf(q);
+ return index !== -1 ? values[index] : null;
+ };
+
+ const val_50 = findValue(0.5);
+ if (val_50 === null || val_50 === undefined) {
+ return;
+ }
- const groundTruthValues = groundTruth[target];
- if (!groundTruthValues) {
- console.warn(`Ground truth data not found for target: ${target}`);
- return { traces: [], rawYRange: null };
- }
+ const val_025 = findValue(0.025);
+ const val_25 = findValue(0.25);
+ const val_75 = findValue(0.75);
+ const val_975 = findValue(0.975);
+
+ const resolved025 = val_025 ?? (fillMissingQuantiles ? val_50 : null);
+ const resolved25 = val_25 ?? (fillMissingQuantiles ? val_50 : null);
+ const resolved75 = val_75 ?? (fillMissingQuantiles ? val_50 : null);
+ const resolved975 = val_975 ?? (fillMissingQuantiles ? val_50 : null);
+
+ if (
+ resolved025 === null ||
+ resolved25 === null ||
+ resolved75 === null ||
+ resolved975 === null
+ ) {
+ return;
+ }
- let rawMin = Infinity;
- let rawMax = -Infinity;
- const updateRange = (value) => {
- if (value === null || value === undefined) return;
- const numeric = Number(value);
- if (Number.isNaN(numeric)) return;
- rawMin = Math.min(rawMin, numeric);
- rawMax = Math.max(rawMax, numeric);
- };
-
- groundTruthValues.forEach((value) => updateRange(value));
-
- const groundTruthY = transformY
- ? groundTruthValues.map((value) => transformY(value))
- : groundTruthValues;
-
- const groundTruthTrace = {
- x: groundTruth.dates || [],
- y: groundTruthY,
- name: groundTruthLabel,
- type: 'scatter',
- mode: showMedian ? 'lines+markers' : 'lines',
- line: { color: 'black', width: groundTruthLineWidth, dash: 'dash' },
- marker: { size: groundTruthMarkerSize, color: 'black' }
- };
-
- if (groundTruthHoverFormatter) {
- groundTruthTrace.text = groundTruthValues.map((value) => groundTruthHoverFormatter(value));
- groundTruthTrace.hovertemplate = `
${groundTruthLabel} Date: %{x}
Value:
%{text}${valueSuffix} `;
- } else {
- groundTruthTrace.hovertemplate = `
${groundTruthLabel} Date: %{x}
Value:
${groundTruthValueFormat}${valueSuffix} `;
- }
+ forecastDates.push(pointDate);
- const modelTraces = selectedModels.flatMap(model =>
- selectedDates.flatMap((date, dateIndex) => {
- const forecastsForDate = forecasts[date] || {};
- const forecast = forecastsForDate[target]?.[model];
- if (!forecast || forecast.type !== 'quantile') return [];
-
- const forecastDates = [];
- const medianValues = [];
- const ci95Upper = [];
- const ci95Lower = [];
- const ci50Upper = [];
- const ci50Lower = [];
- const hoverTexts = [];
-
- const sortedPredictions = Object.values(forecast.predictions || {}).sort((a, b) => new Date(a.date) - new Date(b.date));
-
- sortedPredictions.forEach((pred) => {
- const pointDate = pred.date;
- const { quantiles = [], values = [] } = pred;
-
- const findValue = (q) => {
- const index = quantiles.indexOf(q);
- return index !== -1 ? values[index] : null;
- };
-
- const val_50 = findValue(0.5);
- if (val_50 === null || val_50 === undefined) {
- return;
- }
+ if (showMedian) {
+ medianValues.push(transformY ? transformY(val_50) : val_50);
+ updateRange(val_50);
+ }
+ if (show50) {
+ ci50Lower.push(transformY ? transformY(resolved25) : resolved25);
+ ci50Upper.push(transformY ? transformY(resolved75) : resolved75);
+ updateRange(resolved25);
+ updateRange(resolved75);
+ }
+ if (show95) {
+ ci95Lower.push(transformY ? transformY(resolved025) : resolved025);
+ ci95Upper.push(transformY ? transformY(resolved975) : resolved975);
+ updateRange(resolved025);
+ updateRange(resolved975);
+ }
- const val_025 = findValue(0.025);
- const val_25 = findValue(0.25);
- const val_75 = findValue(0.75);
- const val_975 = findValue(0.975);
+ const formattedMedian = formatValue(val_50);
+ const formatted50 = `${formatValue(resolved25)} - ${formatValue(resolved75)}`;
+ const formatted95 = `${formatValue(resolved025)} - ${formatValue(resolved975)}`;
+
+ const hoverText = modelHoverBuilder
+ ? modelHoverBuilder({
+ model,
+ pointDate,
+ formattedMedian,
+ formatted50,
+ formatted95,
+ issuedDate: date,
+ valueSuffix,
+ })
+ : buildDefaultModelHoverText({
+ model,
+ pointDate,
+ formattedMedian,
+ formatted50,
+ formatted95,
+ issuedDate: date,
+ valueSuffix,
+ show50,
+ show95,
+ });
+
+ hoverTexts.push(hoverText);
+ });
- const resolved025 = val_025 ?? (fillMissingQuantiles ? val_50 : null);
- const resolved25 = val_25 ?? (fillMissingQuantiles ? val_50 : null);
- const resolved75 = val_75 ?? (fillMissingQuantiles ? val_50 : null);
- const resolved975 = val_975 ?? (fillMissingQuantiles ? val_50 : null);
+ if (forecastDates.length === 0) return [];
- if (resolved025 === null || resolved25 === null || resolved75 === null || resolved975 === null) {
- return;
- }
+ const modelColor = modelColorFn
+ ? modelColorFn(model, selectedModels)
+ : resolveModelColor(selectedModels, model);
+ const isFirstDate = dateIndex === 0;
- forecastDates.push(pointDate);
+ const traces = [];
- if (showMedian) {
- medianValues.push(transformY ? transformY(val_50) : val_50);
- updateRange(val_50);
- }
- if (show50) {
- ci50Lower.push(transformY ? transformY(resolved25) : resolved25);
- ci50Upper.push(transformY ? transformY(resolved75) : resolved75);
- updateRange(resolved25);
- updateRange(resolved75);
- }
if (show95) {
- ci95Lower.push(transformY ? transformY(resolved025) : resolved025);
- ci95Upper.push(transformY ? transformY(resolved975) : resolved975);
- updateRange(resolved025);
- updateRange(resolved975);
+ traces.push({
+ x: [...forecastDates, ...forecastDates.slice().reverse()],
+ y: [...ci95Upper, ...ci95Lower.slice().reverse()],
+ fill: "toself",
+ fillcolor: `${modelColor}10`,
+ line: { color: "transparent" },
+ showlegend: false,
+ type: "scatter",
+ name: `${model} 95% CI`,
+ hoverinfo: "none",
+ legendgroup: model,
+ });
}
- const formattedMedian = formatValue(val_50);
- const formatted50 = `${formatValue(resolved25)} - ${formatValue(resolved75)}`;
- const formatted95 = `${formatValue(resolved025)} - ${formatValue(resolved975)}`;
-
- const hoverText = modelHoverBuilder
- ? modelHoverBuilder({
- model,
- pointDate,
- formattedMedian,
- formatted50,
- formatted95,
- issuedDate: date,
- valueSuffix
- })
- : buildDefaultModelHoverText({
- model,
- pointDate,
- formattedMedian,
- formatted50,
- formatted95,
- issuedDate: date,
- valueSuffix,
- show50,
- show95
+ if (show50) {
+ traces.push({
+ x: [...forecastDates, ...forecastDates.slice().reverse()],
+ y: [...ci50Upper, ...ci50Lower.slice().reverse()],
+ fill: "toself",
+ fillcolor: `${modelColor}30`,
+ line: { color: "transparent" },
+ showlegend: false,
+ type: "scatter",
+ name: `${model} 50% CI`,
+ hoverinfo: "none",
+ legendgroup: model,
});
+ }
- hoverTexts.push(hoverText);
- });
-
- if (forecastDates.length === 0) return [];
-
- const modelColor = modelColorFn
- ? modelColorFn(model, selectedModels)
- : resolveModelColor(selectedModels, model);
- const isFirstDate = dateIndex === 0;
-
- const traces = [];
-
- if (show95) {
- traces.push({
- x: [...forecastDates, ...forecastDates.slice().reverse()],
- y: [...ci95Upper, ...ci95Lower.slice().reverse()],
- fill: 'toself',
- fillcolor: `${modelColor}10`,
- line: { color: 'transparent' },
- showlegend: false,
- type: 'scatter',
- name: `${model} 95% CI`,
- hoverinfo: 'none',
- legendgroup: model
- });
- }
-
- if (show50) {
- traces.push({
- x: [...forecastDates, ...forecastDates.slice().reverse()],
- y: [...ci50Upper, ...ci50Lower.slice().reverse()],
- fill: 'toself',
- fillcolor: `${modelColor}30`,
- line: { color: 'transparent' },
- showlegend: false,
- type: 'scatter',
- name: `${model} 50% CI`,
- hoverinfo: 'none',
- legendgroup: model
- });
- }
-
- if (showMedian) {
- traces.push({
- x: forecastDates,
- y: medianValues,
- name: model,
- type: 'scatter',
- mode: 'lines+markers',
- line: { color: modelColor, width: modelLineWidth, dash: 'solid' },
- marker: { size: modelMarkerSize, color: modelColor },
- showlegend: showLegendForFirstDate ? isFirstDate : false,
- legendgroup: model,
- text: hoverTexts,
- hovertemplate: '%{text}',
- hoverlabel: {
- bgcolor: modelColor,
- font: { color: '#ffffff' },
- bordercolor: '#ffffff'
- }
- });
- }
-
- if (!showMedian && (show50 || show95)) {
- traces.push({
- x: [null],
- y: [null],
- name: model,
- type: 'scatter',
- mode: 'lines',
- line: { color: modelColor, width: modelLineWidth },
- showlegend: showLegendForFirstDate ? isFirstDate : false,
- legendgroup: model,
- hoverinfo: 'skip'
- });
- }
-
- return traces;
- })
- );
+ if (showMedian) {
+ traces.push({
+ x: forecastDates,
+ y: medianValues,
+ name: model,
+ type: "scatter",
+ mode: "lines+markers",
+ line: { color: modelColor, width: modelLineWidth, dash: "solid" },
+ marker: { size: modelMarkerSize, color: modelColor },
+ showlegend: showLegendForFirstDate ? isFirstDate : false,
+ legendgroup: model,
+ text: hoverTexts,
+ hovertemplate: "%{text}",
+ hoverlabel: {
+ bgcolor: modelColor,
+ font: { color: "#ffffff" },
+ bordercolor: "#ffffff",
+ },
+ });
+ }
- const rawYRange = rawMin === Infinity || rawMax === -Infinity ? null : [rawMin, rawMax];
+ if (!showMedian && (show50 || show95)) {
+ traces.push({
+ x: [null],
+ y: [null],
+ name: model,
+ type: "scatter",
+ mode: "lines",
+ line: { color: modelColor, width: modelLineWidth },
+ showlegend: showLegendForFirstDate ? isFirstDate : false,
+ legendgroup: model,
+ hoverinfo: "skip",
+ });
+ }
- return { traces: [groundTruthTrace, ...modelTraces], rawYRange };
-}, [
- groundTruth,
- forecasts,
- selectedDates,
- selectedModels,
- target,
- groundTruthLabel,
- groundTruthValueFormat,
- valueSuffix,
- formatValue,
- modelHoverBuilder,
- modelColorFn,
- modelLineWidth,
- modelMarkerSize,
- groundTruthLineWidth,
- groundTruthMarkerSize,
- showLegendForFirstDate,
- fillMissingQuantiles,
- showMedian,
- show50,
- show95,
- transformY,
- groundTruthHoverFormatter
-]);
+ return traces;
+ }),
+ );
+
+ const rawYRange =
+ rawMin === Infinity || rawMax === -Infinity ? null : [rawMin, rawMax];
+
+ return { traces: [groundTruthTrace, ...modelTraces], rawYRange };
+ }, [
+ groundTruth,
+ forecasts,
+ selectedDates,
+ selectedModels,
+ target,
+ groundTruthLabel,
+ groundTruthValueFormat,
+ valueSuffix,
+ formatValue,
+ modelHoverBuilder,
+ modelColorFn,
+ modelLineWidth,
+ modelMarkerSize,
+ groundTruthLineWidth,
+ groundTruthMarkerSize,
+ showLegendForFirstDate,
+ fillMissingQuantiles,
+ showMedian,
+ show50,
+ show95,
+ transformY,
+ groundTruthHoverFormatter,
+ ]);
export default useQuantileForecastTraces;
diff --git a/app/src/hooks/useRespilensStats.js b/app/src/hooks/useRespilensStats.js
index 810f2c67..7d004e5d 100644
--- a/app/src/hooks/useRespilensStats.js
+++ b/app/src/hooks/useRespilensStats.js
@@ -1,6 +1,6 @@
-import { useMemo } from 'react';
-import { getForecastleGames } from '../utils/respilensStorage';
-import { calculateWIS } from '../utils/forecastleScoring';
+import { useMemo } from "react";
+import { getForecastleGames } from "../utils/respilensStorage";
+import { calculateWIS } from "../utils/forecastleScoring";
/**
* Calculate interval coverage for a single game
@@ -39,7 +39,7 @@ function calculateIntervalCoverage(userForecasts, groundTruth) {
return {
coverage95,
coverage50,
- validHorizons
+ validHorizons,
};
}
@@ -66,7 +66,7 @@ function computeGameStats(game) {
forecast.lower50,
forecast.upper50,
forecast.lower95,
- forecast.upper95
+ forecast.upper95,
);
if (wisResult) {
@@ -81,11 +81,15 @@ function computeGameStats(game) {
const wis = validCount > 0 ? sumWIS / validCount : null;
const dispersion = validCount > 0 ? sumDispersion / validCount : null;
- const underprediction = validCount > 0 ? sumUnderprediction / validCount : null;
+ const underprediction =
+ validCount > 0 ? sumUnderprediction / validCount : null;
const overprediction = validCount > 0 ? sumOverprediction / validCount : null;
// Calculate interval coverage
- const coverage = calculateIntervalCoverage(game.userForecasts, game.groundTruth);
+ const coverage = calculateIntervalCoverage(
+ game.userForecasts,
+ game.groundTruth,
+ );
return {
id: game.id,
@@ -136,8 +140,9 @@ function calculateStreaks(games) {
}
// Get unique challenge dates and sort (most recent first)
- const uniqueDates = [...new Set(games.map(g => g.challengeDate))]
- .sort((a, b) => b.localeCompare(a)); // ISO date string comparison
+ const uniqueDates = [...new Set(games.map((g) => g.challengeDate))].sort(
+ (a, b) => b.localeCompare(a),
+ ); // ISO date string comparison
if (uniqueDates.length === 0) {
return { currentStreak: 0, maxStreak: 0 };
@@ -145,13 +150,15 @@ function calculateStreaks(games) {
// Get today's date in UTC (YYYY-MM-DD format)
const today = new Date();
- const todayUTC = new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate()));
+ const todayUTC = new Date(
+ Date.UTC(today.getFullYear(), today.getMonth(), today.getDate()),
+ );
const todayStr = todayUTC.toISOString().slice(0, 10);
// Calculate days difference between two YYYY-MM-DD date strings
const daysDiff = (date1Str, date2Str) => {
- const d1 = new Date(date1Str + 'T00:00:00Z');
- const d2 = new Date(date2Str + 'T00:00:00Z');
+ const d1 = new Date(date1Str + "T00:00:00Z");
+ const d2 = new Date(date2Str + "T00:00:00Z");
return Math.round((d1 - d2) / (1000 * 60 * 60 * 24));
};
@@ -215,7 +222,7 @@ export function useRespilensStats(refreshTrigger) {
maxStreak: 0,
averageRankVsEnsemble: null,
averagePercentDiffEnsemble: null,
- gameHistory: []
+ gameHistory: [],
};
}
@@ -223,59 +230,85 @@ export function useRespilensStats(refreshTrigger) {
const gameStats = games.map(computeGameStats);
// Filter games with valid WIS
- const validGames = gameStats.filter(g => Number.isFinite(g.wis));
+ const validGames = gameStats.filter((g) => Number.isFinite(g.wis));
// Aggregate statistics
const totalWIS = validGames.reduce((sum, g) => sum + g.wis, 0);
- const averageWIS = validGames.length > 0 ? totalWIS / validGames.length : null;
- const bestWIS = validGames.length > 0 ? Math.min(...validGames.map(g => g.wis)) : null;
- const worstWIS = validGames.length > 0 ? Math.max(...validGames.map(g => g.wis)) : null;
+ const averageWIS =
+ validGames.length > 0 ? totalWIS / validGames.length : null;
+ const bestWIS =
+ validGames.length > 0 ? Math.min(...validGames.map((g) => g.wis)) : null;
+ const worstWIS =
+ validGames.length > 0 ? Math.max(...validGames.map((g) => g.wis)) : null;
// Aggregate WIS components
- const totalDispersion = validGames.reduce((sum, g) => sum + (g.dispersion || 0), 0);
- const totalUnderprediction = validGames.reduce((sum, g) => sum + (g.underprediction || 0), 0);
- const totalOverprediction = validGames.reduce((sum, g) => sum + (g.overprediction || 0), 0);
- const averageDispersion = validGames.length > 0 ? totalDispersion / validGames.length : null;
- const averageUnderprediction = validGames.length > 0 ? totalUnderprediction / validGames.length : null;
- const averageOverprediction = validGames.length > 0 ? totalOverprediction / validGames.length : null;
+ const totalDispersion = validGames.reduce(
+ (sum, g) => sum + (g.dispersion || 0),
+ 0,
+ );
+ const totalUnderprediction = validGames.reduce(
+ (sum, g) => sum + (g.underprediction || 0),
+ 0,
+ );
+ const totalOverprediction = validGames.reduce(
+ (sum, g) => sum + (g.overprediction || 0),
+ 0,
+ );
+ const averageDispersion =
+ validGames.length > 0 ? totalDispersion / validGames.length : null;
+ const averageUnderprediction =
+ validGames.length > 0 ? totalUnderprediction / validGames.length : null;
+ const averageOverprediction =
+ validGames.length > 0 ? totalOverprediction / validGames.length : null;
// Aggregate interval coverage
const totalCoverage95 = gameStats.reduce((sum, g) => sum + g.coverage95, 0);
const totalCoverage50 = gameStats.reduce((sum, g) => sum + g.coverage50, 0);
- const totalValidHorizons = gameStats.reduce((sum, g) => sum + g.validHorizons, 0);
+ const totalValidHorizons = gameStats.reduce(
+ (sum, g) => sum + g.validHorizons,
+ 0,
+ );
- const coverage95Percent = totalValidHorizons > 0
- ? (totalCoverage95 / totalValidHorizons) * 100
- : null;
- const coverage50Percent = totalValidHorizons > 0
- ? (totalCoverage50 / totalValidHorizons) * 100
- : null;
+ const coverage95Percent =
+ totalValidHorizons > 0
+ ? (totalCoverage95 / totalValidHorizons) * 100
+ : null;
+ const coverage50Percent =
+ totalValidHorizons > 0
+ ? (totalCoverage50 / totalValidHorizons) * 100
+ : null;
// Calculate streaks
const streaks = calculateStreaks(gameStats);
// Calculate rank comparison vs ensemble
- const gamesWithRankData = gameStats.filter(g =>
- Number.isFinite(g.userRank) && Number.isFinite(g.ensembleRank)
+ const gamesWithRankData = gameStats.filter(
+ (g) => Number.isFinite(g.userRank) && Number.isFinite(g.ensembleRank),
);
- const totalRankDiff = gamesWithRankData.reduce((sum, g) =>
- sum + (g.ensembleRank - g.userRank), 0
+ const totalRankDiff = gamesWithRankData.reduce(
+ (sum, g) => sum + (g.ensembleRank - g.userRank),
+ 0,
);
- const averageRankVsEnsemble = gamesWithRankData.length > 0
- ? totalRankDiff / gamesWithRankData.length
- : null;
+ const averageRankVsEnsemble =
+ gamesWithRankData.length > 0
+ ? totalRankDiff / gamesWithRankData.length
+ : null;
// Calculate % difference in WIS vs ensemble
- const gamesWithWISComparison = gameStats.filter(g =>
- Number.isFinite(g.wis) && Number.isFinite(g.ensembleWIS) && g.ensembleWIS > 0
+ const gamesWithWISComparison = gameStats.filter(
+ (g) =>
+ Number.isFinite(g.wis) &&
+ Number.isFinite(g.ensembleWIS) &&
+ g.ensembleWIS > 0,
);
const totalPercentDiff = gamesWithWISComparison.reduce((sum, g) => {
const percentDiff = ((g.wis - g.ensembleWIS) / g.ensembleWIS) * 100;
return sum + percentDiff;
}, 0);
- const averagePercentDiffEnsemble = gamesWithWISComparison.length > 0
- ? totalPercentDiff / gamesWithWISComparison.length
- : null;
+ const averagePercentDiffEnsemble =
+ gamesWithWISComparison.length > 0
+ ? totalPercentDiff / gamesWithWISComparison.length
+ : null;
return {
gamesPlayed: games.length,
@@ -291,7 +324,7 @@ export function useRespilensStats(refreshTrigger) {
maxStreak: streaks.maxStreak,
averageRankVsEnsemble,
averagePercentDiffEnsemble,
- gameHistory: gameStats
+ gameHistory: gameStats,
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [refreshTrigger]); // Recalculates when refreshTrigger changes
diff --git a/app/src/hooks/useView.js b/app/src/hooks/useView.js
index 8c8cfb42..f32f7e6b 100644
--- a/app/src/hooks/useView.js
+++ b/app/src/hooks/useView.js
@@ -1,10 +1,10 @@
-import { useContext } from 'react';
-import { ViewContext } from '../contexts/ViewContextObject';
+import { useContext } from "react";
+import { ViewContext } from "../contexts/ViewContextObject";
export const useView = () => {
const context = useContext(ViewContext);
if (!context) {
- throw new Error('useView must be used within a ViewProvider');
+ throw new Error("useView must be used within a ViewProvider");
}
return context;
};
diff --git a/app/src/lib/forecast-components/ForecastChart.jsx b/app/src/lib/forecast-components/ForecastChart.jsx
index f06cf615..1fda89cd 100644
--- a/app/src/lib/forecast-components/ForecastChart.jsx
+++ b/app/src/lib/forecast-components/ForecastChart.jsx
@@ -2,7 +2,7 @@
* Reusable Forecast Chart Component
* Extracted from Forecastle for use in tournaments and other forecasting features
*/
-import { memo, useEffect, useMemo, useRef, useState } from 'react';
+import { memo, useEffect, useMemo, useRef, useState } from "react";
import {
BarElement,
BarController,
@@ -16,8 +16,8 @@ import {
PointElement,
ScatterController,
Tooltip,
-} from 'chart.js';
-import { Chart } from 'react-chartjs-2';
+} from "chart.js";
+import { Chart } from "react-chartjs-2";
ChartJS.register(
CategoryScale,
@@ -33,11 +33,11 @@ ChartJS.register(
Filler,
);
-const INTERVAL95_COLOR = 'rgba(220, 20, 60, 0.15)'; // Light crimson
-const INTERVAL50_COLOR = 'rgba(220, 20, 60, 0.30)'; // Darker crimson
-const MEDIAN_COLOR = '#000000';
-const HANDLE_MEDIAN = '#dc143c'; // Crimson
-const HANDLE_OUTLINE = '#000000';
+const INTERVAL95_COLOR = "rgba(220, 20, 60, 0.15)"; // Light crimson
+const INTERVAL50_COLOR = "rgba(220, 20, 60, 0.30)"; // Darker crimson
+const MEDIAN_COLOR = "#000000";
+const HANDLE_MEDIAN = "#dc143c"; // Crimson
+const HANDLE_OUTLINE = "#000000";
const buildLabels = (groundTruthSeries, horizonDates) => {
const observedLabels = groundTruthSeries.map((entry) => entry.date);
@@ -90,10 +90,15 @@ const ForecastChartInner = ({
return groundTruthSeries.slice(-3);
}, [groundTruthSeries, zoomedView]);
- const labels = useMemo(() => buildLabels(visibleGroundTruth, horizonDates), [visibleGroundTruth, horizonDates]);
+ const labels = useMemo(
+ () => buildLabels(visibleGroundTruth, horizonDates),
+ [visibleGroundTruth, horizonDates],
+ );
const observedDataset = useMemo(() => {
- const valueMap = new Map(visibleGroundTruth.map((entry) => [entry.date, entry.value]));
+ const valueMap = new Map(
+ visibleGroundTruth.map((entry) => [entry.date, entry.value]),
+ );
return labels.map((label) => {
if (valueMap.has(label)) {
return { x: label, y: valueMap.get(label) ?? null };
@@ -107,7 +112,9 @@ const ForecastChartInner = ({
() =>
horizonDates.map((date, idx) => ({
x: date,
- y: entries[idx]?.upper95 ?? ((entries[idx]?.median ?? 0) + (entries[idx]?.width95 ?? 0)),
+ y:
+ entries[idx]?.upper95 ??
+ (entries[idx]?.median ?? 0) + (entries[idx]?.width95 ?? 0),
})),
[entries, horizonDates],
);
@@ -116,7 +123,12 @@ const ForecastChartInner = ({
() =>
horizonDates.map((date, idx) => ({
x: date,
- y: entries[idx]?.lower95 ?? Math.max(0, (entries[idx]?.median ?? 0) - (entries[idx]?.width95 ?? 0)),
+ y:
+ entries[idx]?.lower95 ??
+ Math.max(
+ 0,
+ (entries[idx]?.median ?? 0) - (entries[idx]?.width95 ?? 0),
+ ),
})),
[entries, horizonDates],
);
@@ -125,7 +137,9 @@ const ForecastChartInner = ({
() =>
horizonDates.map((date, idx) => ({
x: date,
- y: entries[idx]?.upper50 ?? ((entries[idx]?.median ?? 0) + (entries[idx]?.width50 ?? 0)),
+ y:
+ entries[idx]?.upper50 ??
+ (entries[idx]?.median ?? 0) + (entries[idx]?.width50 ?? 0),
})),
[entries, horizonDates],
);
@@ -134,7 +148,12 @@ const ForecastChartInner = ({
() =>
horizonDates.map((date, idx) => ({
x: date,
- y: entries[idx]?.lower50 ?? Math.max(0, (entries[idx]?.median ?? 0) - (entries[idx]?.width50 ?? 0)),
+ y:
+ entries[idx]?.lower50 ??
+ Math.max(
+ 0,
+ (entries[idx]?.median ?? 0) - (entries[idx]?.width50 ?? 0),
+ ),
})),
[entries, horizonDates],
);
@@ -165,7 +184,7 @@ const ForecastChartInner = ({
return horizonDates.map((date, idx) => ({
x: date,
y: entries[idx]?.median ?? 0,
- meta: { index: idx, type: 'median' },
+ meta: { index: idx, type: "median" },
radius: 8,
}));
}, [entries, horizonDates]);
@@ -177,26 +196,40 @@ const ForecastChartInner = ({
horizonDates.forEach((date, idx) => {
handles.push({
x: date,
- y: entries[idx]?.upper95 ?? ((entries[idx]?.median ?? 0) + (entries[idx]?.width95 ?? 0)),
- meta: { index: idx, type: 'upper95' },
+ y:
+ entries[idx]?.upper95 ??
+ (entries[idx]?.median ?? 0) + (entries[idx]?.width95 ?? 0),
+ meta: { index: idx, type: "upper95" },
radius: 6,
});
handles.push({
x: date,
- y: entries[idx]?.lower95 ?? Math.max(0, (entries[idx]?.median ?? 0) - (entries[idx]?.width95 ?? 0)),
- meta: { index: idx, type: 'lower95' },
+ y:
+ entries[idx]?.lower95 ??
+ Math.max(
+ 0,
+ (entries[idx]?.median ?? 0) - (entries[idx]?.width95 ?? 0),
+ ),
+ meta: { index: idx, type: "lower95" },
radius: 6,
});
handles.push({
x: date,
- y: entries[idx]?.upper50 ?? ((entries[idx]?.median ?? 0) + (entries[idx]?.width50 ?? 0)),
- meta: { index: idx, type: 'upper50' },
+ y:
+ entries[idx]?.upper50 ??
+ (entries[idx]?.median ?? 0) + (entries[idx]?.width50 ?? 0),
+ meta: { index: idx, type: "upper50" },
radius: 5,
});
handles.push({
x: date,
- y: entries[idx]?.lower50 ?? Math.max(0, (entries[idx]?.median ?? 0) - (entries[idx]?.width50 ?? 0)),
- meta: { index: idx, type: 'lower50' },
+ y:
+ entries[idx]?.lower50 ??
+ Math.max(
+ 0,
+ (entries[idx]?.median ?? 0) - (entries[idx]?.width50 ?? 0),
+ ),
+ meta: { index: idx, type: "lower50" },
radius: 5,
});
});
@@ -212,7 +245,9 @@ const ForecastChartInner = ({
);
let groundTruthMax = 0;
if (showScoring && scores?.groundTruth) {
- groundTruthMax = Math.max(...scores.groundTruth.filter(v => v !== null));
+ groundTruthMax = Math.max(
+ ...scores.groundTruth.filter((v) => v !== null),
+ );
}
const visibleMax = Math.max(lastValue, forecastMax, groundTruthMax);
return visibleMax > 0 ? visibleMax * 1.5 : 1;
@@ -240,9 +275,9 @@ const ForecastChartInner = ({
const dataset = chart.data.datasets[activeElement.datasetIndex];
if (!dataset) return null;
- if (dataset.label === 'Median Handles') {
+ if (dataset.label === "Median Handles") {
return medianHandles[activeElement.index]?.meta || null;
- } else if (dataset.label === 'Interval Handles') {
+ } else if (dataset.label === "Interval Handles") {
return intervalHandles[activeElement.index]?.meta || null;
}
@@ -261,20 +296,32 @@ const ForecastChartInner = ({
const nextValue = Math.max(0, yScale.getValueForPixel(offsetY));
const roundedValue = Math.round(nextValue);
- if (dragState.type === 'median') {
- onAdjust(dragState.index, 'median', roundedValue);
- } else if (dragState.type === 'upper95') {
+ if (dragState.type === "median") {
+ onAdjust(dragState.index, "median", roundedValue);
+ } else if (dragState.type === "upper95") {
const entry = entries[dragState.index];
- onAdjust(dragState.index, 'interval95', [entry.lower95, roundedValue]);
- } else if (dragState.type === 'lower95') {
+ onAdjust(dragState.index, "interval95", [
+ entry.lower95,
+ roundedValue,
+ ]);
+ } else if (dragState.type === "lower95") {
const entry = entries[dragState.index];
- onAdjust(dragState.index, 'interval95', [roundedValue, entry.upper95]);
- } else if (dragState.type === 'upper50') {
+ onAdjust(dragState.index, "interval95", [
+ roundedValue,
+ entry.upper95,
+ ]);
+ } else if (dragState.type === "upper50") {
const entry = entries[dragState.index];
- onAdjust(dragState.index, 'interval50', [entry.lower50, roundedValue]);
- } else if (dragState.type === 'lower50') {
+ onAdjust(dragState.index, "interval50", [
+ entry.lower50,
+ roundedValue,
+ ]);
+ } else if (dragState.type === "lower50") {
const entry = entries[dragState.index];
- onAdjust(dragState.index, 'interval50', [roundedValue, entry.upper50]);
+ onAdjust(dragState.index, "interval50", [
+ roundedValue,
+ entry.upper50,
+ ]);
}
});
};
@@ -285,7 +332,12 @@ const ForecastChartInner = ({
};
const pointerDown = (event) => {
- const elements = chart.getElementsAtEventForMode(event, 'nearest', { intersect: true }, false);
+ const elements = chart.getElementsAtEventForMode(
+ event,
+ "nearest",
+ { intersect: true },
+ false,
+ );
if (!elements?.length) {
setDragState(null);
return;
@@ -300,202 +352,228 @@ const ForecastChartInner = ({
setDragState(meta);
};
- canvas.addEventListener('pointerdown', pointerDown);
- window.addEventListener('pointermove', pointerMove);
- window.addEventListener('pointerup', pointerUp);
- window.addEventListener('pointercancel', pointerUp);
+ canvas.addEventListener("pointerdown", pointerDown);
+ window.addEventListener("pointermove", pointerMove);
+ window.addEventListener("pointerup", pointerUp);
+ window.addEventListener("pointercancel", pointerUp);
return () => {
- canvas.removeEventListener('pointerdown', pointerDown);
- window.removeEventListener('pointermove', pointerMove);
- window.removeEventListener('pointerup', pointerUp);
- window.removeEventListener('pointercancel', pointerUp);
+ canvas.removeEventListener("pointerdown", pointerDown);
+ window.removeEventListener("pointermove", pointerMove);
+ window.removeEventListener("pointerup", pointerUp);
+ window.removeEventListener("pointercancel", pointerUp);
};
- }, [dragState, onAdjust, entries, medianHandles, intervalHandles, interactive, showScoring]);
+ }, [
+ dragState,
+ onAdjust,
+ entries,
+ medianHandles,
+ intervalHandles,
+ interactive,
+ showScoring,
+ ]);
// Ground truth for forecast horizons (scoring mode only)
const groundTruthForecastPoints = useMemo(() => {
if (!showScoring || !scores?.groundTruth) return [];
- return horizonDates.map((date, idx) => ({
- x: date,
- y: scores.groundTruth[idx],
- })).filter(point => point.y !== null);
+ return horizonDates
+ .map((date, idx) => ({
+ x: date,
+ y: scores.groundTruth[idx],
+ }))
+ .filter((point) => point.y !== null);
}, [showScoring, scores, horizonDates]);
- const chartData = useMemo(
- () => {
- const datasets = [
+ const chartData = useMemo(() => {
+ const datasets = [
+ {
+ type: "line",
+ label: "Observed",
+ data: observedDataset,
+ parsing: false,
+ tension: 0,
+ spanGaps: true,
+ borderColor: MEDIAN_COLOR,
+ backgroundColor: MEDIAN_COLOR,
+ borderWidth: 2,
+ pointRadius: 4,
+ pointHoverRadius: 6,
+ pointBackgroundColor: MEDIAN_COLOR,
+ pointBorderColor: "#ffffff",
+ pointBorderWidth: 1,
+ },
+ ];
+
+ // Show intervals when in interval mode
+ if (showIntervals) {
+ datasets.push(
{
- type: 'line',
- label: 'Observed',
- data: observedDataset,
+ type: "line",
+ label: "95% lower",
+ data: interval95Lower,
parsing: false,
tension: 0,
- spanGaps: true,
- borderColor: MEDIAN_COLOR,
- backgroundColor: MEDIAN_COLOR,
- borderWidth: 2,
- pointRadius: 4,
- pointHoverRadius: 6,
- pointBackgroundColor: MEDIAN_COLOR,
- pointBorderColor: '#ffffff',
- pointBorderWidth: 1,
+ borderColor: "transparent",
+ backgroundColor: "transparent",
+ pointRadius: 0,
+ fill: false,
},
- ];
-
- // Show intervals when in interval mode
- if (showIntervals) {
- datasets.push(
- {
- type: 'line',
- label: '95% lower',
- data: interval95Lower,
- parsing: false,
- tension: 0,
- borderColor: 'transparent',
- backgroundColor: 'transparent',
- pointRadius: 0,
- fill: false,
- },
- {
- type: 'line',
- label: '95% interval',
- data: interval95Upper,
- parsing: false,
- tension: 0,
- borderColor: 'transparent',
- backgroundColor: INTERVAL95_COLOR,
- borderWidth: 0,
- pointRadius: 0,
- fill: '-1',
- },
- {
- type: 'line',
- label: '50% lower',
- data: interval50Lower,
- parsing: false,
- tension: 0,
- borderColor: 'transparent',
- backgroundColor: 'transparent',
- pointRadius: 0,
- fill: false,
- },
- {
- type: 'line',
- label: '50% interval',
- data: interval50Upper,
- parsing: false,
- tension: 0,
- borderColor: 'transparent',
- backgroundColor: INTERVAL50_COLOR,
- borderWidth: 0,
- pointRadius: 0,
- fill: '-1',
- }
- );
- }
-
- // In scoring mode, show ground truth
- if (showScoring && groundTruthForecastPoints.length > 0) {
- const fullGroundTruthLine = [...observedDataset.filter(d => d.y !== null), ...groundTruthForecastPoints];
- datasets.push({
- type: 'line',
- label: 'Ground Truth',
- data: fullGroundTruthLine,
+ {
+ type: "line",
+ label: "95% interval",
+ data: interval95Upper,
parsing: false,
tension: 0,
- spanGaps: false,
- borderColor: MEDIAN_COLOR,
- backgroundColor: MEDIAN_COLOR,
- borderWidth: 2,
- pointRadius: 4,
- pointHoverRadius: 6,
- pointBackgroundColor: MEDIAN_COLOR,
- pointBorderColor: '#ffffff',
- pointBorderWidth: 1,
- });
- }
+ borderColor: "transparent",
+ backgroundColor: INTERVAL95_COLOR,
+ borderWidth: 0,
+ pointRadius: 0,
+ fill: "-1",
+ },
+ {
+ type: "line",
+ label: "50% lower",
+ data: interval50Lower,
+ parsing: false,
+ tension: 0,
+ borderColor: "transparent",
+ backgroundColor: "transparent",
+ pointRadius: 0,
+ fill: false,
+ },
+ {
+ type: "line",
+ label: "50% interval",
+ data: interval50Upper,
+ parsing: false,
+ tension: 0,
+ borderColor: "transparent",
+ backgroundColor: INTERVAL50_COLOR,
+ borderWidth: 0,
+ pointRadius: 0,
+ fill: "-1",
+ },
+ );
+ }
- // User's forecast
+ // In scoring mode, show ground truth
+ if (showScoring && groundTruthForecastPoints.length > 0) {
+ const fullGroundTruthLine = [
+ ...observedDataset.filter((d) => d.y !== null),
+ ...groundTruthForecastPoints,
+ ];
datasets.push({
- type: 'line',
- label: showScoring ? 'Your Forecast' : 'Median',
- data: medianData,
+ type: "line",
+ label: "Ground Truth",
+ data: fullGroundTruthLine,
parsing: false,
tension: 0,
- borderColor: showScoring ? '#dc143c' : MEDIAN_COLOR,
- backgroundColor: showScoring ? '#dc143c' : MEDIAN_COLOR,
- borderWidth: showScoring ? 3 : 3,
- pointRadius: showScoring ? 5 : 0,
- pointBackgroundColor: showScoring ? '#dc143c' : HANDLE_MEDIAN,
- pointBorderColor: showScoring ? '#ffffff' : '#000000',
- pointBorderWidth: showScoring ? 1 : 2,
- borderDash: [5, 5],
+ spanGaps: false,
+ borderColor: MEDIAN_COLOR,
+ backgroundColor: MEDIAN_COLOR,
+ borderWidth: 2,
+ pointRadius: 4,
+ pointHoverRadius: 6,
+ pointBackgroundColor: MEDIAN_COLOR,
+ pointBorderColor: "#ffffff",
+ pointBorderWidth: 1,
});
+ }
- // Only show draggable handles when not in scoring mode
- if (!showScoring && interactive) {
+ // User's forecast
+ datasets.push({
+ type: "line",
+ label: showScoring ? "Your Forecast" : "Median",
+ data: medianData,
+ parsing: false,
+ tension: 0,
+ borderColor: showScoring ? "#dc143c" : MEDIAN_COLOR,
+ backgroundColor: showScoring ? "#dc143c" : MEDIAN_COLOR,
+ borderWidth: showScoring ? 3 : 3,
+ pointRadius: showScoring ? 5 : 0,
+ pointBackgroundColor: showScoring ? "#dc143c" : HANDLE_MEDIAN,
+ pointBorderColor: showScoring ? "#ffffff" : "#000000",
+ pointBorderWidth: showScoring ? 1 : 2,
+ borderDash: [5, 5],
+ });
+
+ // Only show draggable handles when not in scoring mode
+ if (!showScoring && interactive) {
+ datasets.push({
+ type: "scatter",
+ label: "Median Handles",
+ data: medianHandles,
+ parsing: false,
+ pointBackgroundColor: HANDLE_MEDIAN,
+ pointBorderColor: HANDLE_OUTLINE,
+ pointBorderWidth: 2,
+ pointHoverRadius: 10,
+ pointRadius: 8,
+ showLine: false,
+ hitRadius: 15,
+ });
+
+ if (showIntervals && intervalHandles.length > 0) {
datasets.push({
- type: 'scatter',
- label: 'Median Handles',
- data: medianHandles,
+ type: "scatter",
+ label: "Interval Handles",
+ data: intervalHandles,
parsing: false,
- pointBackgroundColor: HANDLE_MEDIAN,
+ pointBackgroundColor: (context) => {
+ const meta = intervalHandles[context.dataIndex]?.meta;
+ if (!meta) return "rgba(220, 20, 60, 0.8)";
+ if (meta.type === "upper95" || meta.type === "lower95") {
+ return "rgba(255, 182, 193, 0.9)";
+ }
+ return "rgba(220, 20, 60, 0.9)";
+ },
pointBorderColor: HANDLE_OUTLINE,
pointBorderWidth: 2,
- pointHoverRadius: 10,
- pointRadius: 8,
+ pointHoverRadius: 8,
+ pointRadius: (context) => {
+ return intervalHandles[context.dataIndex]?.radius ?? 6;
+ },
showLine: false,
- hitRadius: 15,
+ hitRadius: 12,
});
-
- if (showIntervals && intervalHandles.length > 0) {
- datasets.push({
- type: 'scatter',
- label: 'Interval Handles',
- data: intervalHandles,
- parsing: false,
- pointBackgroundColor: (context) => {
- const meta = intervalHandles[context.dataIndex]?.meta;
- if (!meta) return 'rgba(220, 20, 60, 0.8)';
- if (meta.type === 'upper95' || meta.type === 'lower95') {
- return 'rgba(255, 182, 193, 0.9)';
- }
- return 'rgba(220, 20, 60, 0.9)';
- },
- pointBorderColor: HANDLE_OUTLINE,
- pointBorderWidth: 2,
- pointHoverRadius: 8,
- pointRadius: (context) => {
- return intervalHandles[context.dataIndex]?.radius ?? 6;
- },
- showLine: false,
- hitRadius: 12,
- });
- }
}
+ }
- return { datasets, labels };
- },
- [medianHandles, intervalHandles, interval50Upper, interval50Lower, interval95Upper, interval95Lower, medianData, labels, observedDataset, showIntervals, showScoring, groundTruthForecastPoints, interactive],
- );
+ return { datasets, labels };
+ }, [
+ medianHandles,
+ intervalHandles,
+ interval50Upper,
+ interval50Lower,
+ interval95Upper,
+ interval95Lower,
+ medianData,
+ labels,
+ observedDataset,
+ showIntervals,
+ showScoring,
+ groundTruthForecastPoints,
+ interactive,
+ ]);
const options = useMemo(
() => ({
responsive: true,
maintainAspectRatio: false,
interaction: {
- mode: 'nearest',
+ mode: "nearest",
intersect: true,
},
plugins: {
legend: {
display: showScoring,
- position: 'bottom',
+ position: "bottom",
labels: {
filter: (legendItem) => {
- return !legendItem.text.includes('lower') &&
- !legendItem.text.includes('Handles');
+ return (
+ !legendItem.text.includes("lower") &&
+ !legendItem.text.includes("Handles")
+ );
},
usePointStyle: true,
padding: 12,
@@ -507,18 +585,21 @@ const ForecastChartInner = ({
tooltip: {
callbacks: {
label: (context) => {
- const datasetLabel = context.dataset.label || '';
- if (datasetLabel === 'Observed') {
- return `${datasetLabel}: ${context.parsed.y?.toLocaleString('en-US') ?? '—'}`;
+ const datasetLabel = context.dataset.label || "";
+ if (datasetLabel === "Observed") {
+ return `${datasetLabel}: ${context.parsed.y?.toLocaleString("en-US") ?? "—"}`;
}
- if (datasetLabel.includes('interval')) {
+ if (datasetLabel.includes("interval")) {
if (Array.isArray(context.raw?.y)) {
const [lower, upper] = context.raw.y;
return `${datasetLabel}: ${Math.round(lower)} – ${Math.round(upper)}`;
}
return datasetLabel;
}
- if (datasetLabel === 'Median' || datasetLabel === 'Median Handles') {
+ if (
+ datasetLabel === "Median" ||
+ datasetLabel === "Median Handles"
+ ) {
return `Median: ${Math.round(context.parsed.y)}`;
}
return datasetLabel;
@@ -528,9 +609,9 @@ const ForecastChartInner = ({
},
scales: {
x: {
- type: 'category',
+ type: "category",
ticks: {
- color: '#000000',
+ color: "#000000",
autoSkip: true,
maxRotation: 45,
minRotation: 45,
@@ -543,11 +624,11 @@ const ForecastChartInner = ({
beginAtZero: true,
suggestedMax: dynamicMax,
ticks: {
- color: '#000000',
- callback: (value) => Math.round(value).toLocaleString('en-US'),
+ color: "#000000",
+ callback: (value) => Math.round(value).toLocaleString("en-US"),
},
grid: {
- color: 'rgba(0, 0, 0, 0.08)',
+ color: "rgba(0, 0, 0, 0.08)",
},
},
},
@@ -564,13 +645,13 @@ const ForecastChartInner = ({
return (
@@ -579,6 +660,6 @@ const ForecastChartInner = ({
};
const ForecastChart = memo(ForecastChartInner);
-ForecastChart.displayName = 'ForecastChart';
+ForecastChart.displayName = "ForecastChart";
export default ForecastChart;
diff --git a/app/src/lib/forecast-components/index.js b/app/src/lib/forecast-components/index.js
index 27deb921..8190d349 100644
--- a/app/src/lib/forecast-components/index.js
+++ b/app/src/lib/forecast-components/index.js
@@ -3,9 +3,9 @@
* Reusable components for forecasting features across RespiLens
*/
-export { default as ForecastChart } from './ForecastChart.jsx';
+export { default as ForecastChart } from "./ForecastChart.jsx";
export {
calculateWIS,
validateForecastIntervals,
calculateAverageWIS,
-} from './scoring.js';
+} from "./scoring.js";
diff --git a/app/src/lib/forecast-components/scoring.js b/app/src/lib/forecast-components/scoring.js
index 921d2ee9..2a70ebc2 100644
--- a/app/src/lib/forecast-components/scoring.js
+++ b/app/src/lib/forecast-components/scoring.js
@@ -12,13 +12,19 @@
* @returns {Object} Interval score with components {score, dispersion, underprediction, overprediction}
*/
const calculateIntervalScore = (observed, lower, upper, alpha) => {
- if (!Number.isFinite(observed) || !Number.isFinite(lower) || !Number.isFinite(upper)) {
+ if (
+ !Number.isFinite(observed) ||
+ !Number.isFinite(lower) ||
+ !Number.isFinite(upper)
+ ) {
return null;
}
const dispersion = upper - lower;
- const underprediction = observed < lower ? (2 / alpha) * (lower - observed) : 0;
- const overprediction = observed > upper ? (2 / alpha) * (observed - upper) : 0;
+ const underprediction =
+ observed < lower ? (2 / alpha) * (lower - observed) : 0;
+ const overprediction =
+ observed > upper ? (2 / alpha) * (observed - upper) : 0;
const score = dispersion + underprediction + overprediction;
return {
@@ -39,7 +45,14 @@ const calculateIntervalScore = (observed, lower, upper, alpha) => {
* @param {number} upper95 - Upper bound of 95% interval (0.975 quantile)
* @returns {Object} WIS with components {wis, dispersion, underprediction, overprediction}
*/
-export const calculateWIS = (observed, median, lower50, upper50, lower95, upper95) => {
+export const calculateWIS = (
+ observed,
+ median,
+ lower50,
+ upper50,
+ lower95,
+ upper95,
+) => {
if (!Number.isFinite(observed)) {
return null;
}
@@ -62,27 +75,26 @@ export const calculateWIS = (observed, median, lower50, upper50, lower95, upper9
// Weighted sum
const totalWeight = weight50 + weight95 + weightMedian;
- const wis = (
- weight50 * interval50.score +
- weight95 * interval95.score +
- weightMedian * medianAE
- ) / totalWeight;
+ const wis =
+ (weight50 * interval50.score +
+ weight95 * interval95.score +
+ weightMedian * medianAE) /
+ totalWeight;
// Calculate aggregate components
- const dispersion = (
- weight50 * interval50.dispersion +
- weight95 * interval95.dispersion
- ) / totalWeight;
+ const dispersion =
+ (weight50 * interval50.dispersion + weight95 * interval95.dispersion) /
+ totalWeight;
- const underprediction = (
- weight50 * interval50.underprediction +
- weight95 * interval95.underprediction
- ) / totalWeight;
+ const underprediction =
+ (weight50 * interval50.underprediction +
+ weight95 * interval95.underprediction) /
+ totalWeight;
- const overprediction = (
- weight50 * interval50.overprediction +
- weight95 * interval95.overprediction
- ) / totalWeight;
+ const overprediction =
+ (weight50 * interval50.overprediction +
+ weight95 * interval95.overprediction) /
+ totalWeight;
return {
wis,
@@ -101,30 +113,30 @@ export const validateForecastIntervals = (forecast) => {
const errors = [];
if (!forecast) {
- return { valid: false, errors: ['Forecast is required'] };
+ return { valid: false, errors: ["Forecast is required"] };
}
const { median, q25, q75, q025, q975 } = forecast;
// Check all values are numbers
- if (!Number.isFinite(median)) errors.push('Median must be a number');
- if (!Number.isFinite(q25)) errors.push('25th percentile must be a number');
- if (!Number.isFinite(q75)) errors.push('75th percentile must be a number');
- if (!Number.isFinite(q025)) errors.push('2.5th percentile must be a number');
- if (!Number.isFinite(q975)) errors.push('97.5th percentile must be a number');
+ if (!Number.isFinite(median)) errors.push("Median must be a number");
+ if (!Number.isFinite(q25)) errors.push("25th percentile must be a number");
+ if (!Number.isFinite(q75)) errors.push("75th percentile must be a number");
+ if (!Number.isFinite(q025)) errors.push("2.5th percentile must be a number");
+ if (!Number.isFinite(q975)) errors.push("97.5th percentile must be a number");
// Check all values are non-negative
- if (median < 0) errors.push('Median must be non-negative');
- if (q25 < 0) errors.push('25th percentile must be non-negative');
- if (q75 < 0) errors.push('75th percentile must be non-negative');
- if (q025 < 0) errors.push('2.5th percentile must be non-negative');
- if (q975 < 0) errors.push('97.5th percentile must be non-negative');
+ if (median < 0) errors.push("Median must be non-negative");
+ if (q25 < 0) errors.push("25th percentile must be non-negative");
+ if (q75 < 0) errors.push("75th percentile must be non-negative");
+ if (q025 < 0) errors.push("2.5th percentile must be non-negative");
+ if (q975 < 0) errors.push("97.5th percentile must be non-negative");
// Check interval ordering: q025 <= q25 <= median <= q75 <= q975
- if (q025 > q25) errors.push('2.5th percentile must be <= 25th percentile');
- if (q25 > median) errors.push('25th percentile must be <= median');
- if (median > q75) errors.push('Median must be <= 75th percentile');
- if (q75 > q975) errors.push('75th percentile must be <= 97.5th percentile');
+ if (q025 > q25) errors.push("2.5th percentile must be <= 25th percentile");
+ if (q25 > median) errors.push("25th percentile must be <= median");
+ if (median > q75) errors.push("Median must be <= 75th percentile");
+ if (q75 > q975) errors.push("75th percentile must be <= 97.5th percentile");
return {
valid: errors.length === 0,
@@ -139,7 +151,12 @@ export const validateForecastIntervals = (forecast) => {
* @returns {number} Average WIS
*/
export const calculateAverageWIS = (forecasts, observations) => {
- if (!forecasts || !observations || forecasts.length === 0 || observations.length === 0) {
+ if (
+ !forecasts ||
+ !observations ||
+ forecasts.length === 0 ||
+ observations.length === 0
+ ) {
return null;
}
@@ -147,21 +164,23 @@ export const calculateAverageWIS = (forecasts, observations) => {
return null;
}
- const wisScores = forecasts.map((forecast, idx) => {
- const obs = observations[idx];
- if (!Number.isFinite(obs)) return null;
-
- const result = calculateWIS(
- obs,
- forecast.median,
- forecast.q25,
- forecast.q75,
- forecast.q025,
- forecast.q975
- );
-
- return result?.wis ?? null;
- }).filter(score => score !== null);
+ const wisScores = forecasts
+ .map((forecast, idx) => {
+ const obs = observations[idx];
+ if (!Number.isFinite(obs)) return null;
+
+ const result = calculateWIS(
+ obs,
+ forecast.median,
+ forecast.q25,
+ forecast.q75,
+ forecast.q025,
+ forecast.q975,
+ );
+
+ return result?.wis ?? null;
+ })
+ .filter((score) => score !== null);
if (wisScores.length === 0) return null;
diff --git a/app/src/main.jsx b/app/src/main.jsx
index 26bff3e8..d73dd40a 100644
--- a/app/src/main.jsx
+++ b/app/src/main.jsx
@@ -1,23 +1,20 @@
-import { StrictMode } from 'react'
-import { createRoot } from 'react-dom/client'
-import { MantineProvider } from '@mantine/core'
-import { Notifications } from '@mantine/notifications'
-import '@mantine/core/styles.css'
-import '@mantine/notifications/styles.css'
-import '@mantine/dates/styles.css'
-import '@mantine/spotlight/styles.css'
-import '@mantine/carousel/styles.css'
-import App from './App.jsx'
-import { theme } from './theme/mantine.js'
+import { StrictMode } from "react";
+import { createRoot } from "react-dom/client";
+import { MantineProvider } from "@mantine/core";
+import { Notifications } from "@mantine/notifications";
+import "@mantine/core/styles.css";
+import "@mantine/notifications/styles.css";
+import "@mantine/dates/styles.css";
+import "@mantine/spotlight/styles.css";
+import "@mantine/carousel/styles.css";
+import App from "./App.jsx";
+import { theme } from "./theme/mantine.js";
-
-createRoot(document.getElementById('root')).render(
+createRoot(document.getElementById("root")).render(
-
+
,
-)
+);
diff --git a/app/src/theme/README.md b/app/src/theme/README.md
index ad68f4e0..0a73efb0 100644
--- a/app/src/theme/README.md
+++ b/app/src/theme/README.md
@@ -5,6 +5,7 @@ This document outlines the centralized color system for the RespiLens applicatio
## Overview
The color system is centralized in `/src/theme/mantine.js` and provides:
+
- **Consistent branding** across all components
- **Semantic color meanings** for better UX
- **Model color preservation** for data visualization
@@ -15,79 +16,79 @@ The color system is centralized in `/src/theme/mantine.js` and provides:
### Accessing Colors in Components
```jsx
-import { useMantineTheme } from '@mantine/core';
+import { useMantineTheme } from "@mantine/core";
const MyComponent = () => {
const theme = useMantineTheme();
const colors = theme.other.colors;
-
- return (
-
- Primary colored text
-
- );
+
+ return
Primary colored text ;
};
```
### Using Model Colors
```jsx
-import { useMantineTheme } from '@mantine/core';
+import { useMantineTheme } from "@mantine/core";
const MyComponent = ({ model, selectedModels }) => {
const theme = useMantineTheme();
const modelColor = theme.other.getModelColor(model, selectedModels);
-
- return (
-
- Model visualization
-
- );
+
+ return
Model visualization
;
};
```
## Color Categories
### Primary Brand Colors
+
- `colors.primary` - Main blue (#2563eb)
- `colors.primaryDark` - Darker blue (#1d4ed8)
- `colors.primaryLight` - Lighter blue (#3b82f6)
### Status Colors
+
- `colors.success` - Green (#10b981)
- `colors.warning` - Amber (#f59e0b)
- `colors.error` - Red (#ef4444)
- `colors.info` - Cyan (#06b6d4)
### Text Colors
+
- `colors.text.primary` - Dark gray (#111827)
- `colors.text.secondary` - Medium gray (#6b7280)
- `colors.text.muted` - Light gray (#9ca3af)
- `colors.text.inverse` - White (#ffffff)
### Background Colors
+
- `colors.background.primary` - White (#ffffff)
- `colors.background.secondary` - Very light gray (#f9fafb)
- `colors.background.tertiary` - Light gray (#f3f4f6)
- `colors.background.dark` - Dark mode background (#111827)
### Border Colors
+
- `colors.border.light` - Light border (#e5e7eb)
- `colors.border.medium` - Medium border (#d1d5db)
- `colors.border.dark` - Dark border (#6b7280)
### Forecast-Specific Colors
+
- `colors.forecast.line` - Main forecast line (#2563eb)
- `colors.forecast.confidence95` - 95% CI opacity ('10')
- `colors.forecast.confidence50` - 50% CI opacity ('30')
- `colors.forecast.groundTruth` - Ground truth data (#000000)
### Navigation Colors
+
- `colors.navigation.active` - Active nav item (#2563eb)
- `colors.navigation.hover` - Hover state (#3b82f6)
- `colors.navigation.text` - Nav text (#374151)
### Special Elements
+
- `colors.alpha` - Red alpha superscript (#ef4444)
- `colors.logo` - Logo text color (#2563eb)
@@ -122,16 +123,18 @@ When updating existing components:
5. **Model colors**: Continue using existing model color functions
### Before
+
```jsx
-
Error text
+
Error text
```
### After
+
```jsx
const theme = useMantineTheme();
const colors = theme.other.colors;
-
Error text
+
Error text ;
```
## Benefits
@@ -141,4 +144,4 @@ const colors = theme.other.colors;
- **Accessibility**: Colors chosen for good contrast ratios
- **Semantic meaning**: Colors convey meaning (error, success, etc.)
- **Theme compatibility**: Works with light/dark modes
-- **Model preservation**: Existing model visualizations unchanged
\ No newline at end of file
+- **Model preservation**: Existing model visualizations unchanged
diff --git a/app/src/theme/mantine.js b/app/src/theme/mantine.js
index 624450c2..d0686080 100644
--- a/app/src/theme/mantine.js
+++ b/app/src/theme/mantine.js
@@ -1,11 +1,27 @@
-import { createTheme } from '@mantine/core';
+import { createTheme } from "@mantine/core";
// Model colors - keep existing model color system intact
export const MODEL_COLORS = [
- '#1f77b4', '#ff7f0e', '#2ca02c', '#d62728', '#9467bd',
- '#8c564b', '#e377c2', '#7f7f7f', '#bcbd22', '#17becf',
- '#aec7e8', '#ffbb78', '#98df8a', '#ff9896', '#c5b0d5',
- '#c49c94', '#f7b6d2', '#c7c7c7', '#dbdb8d', '#9edae5'
+ "#1f77b4",
+ "#ff7f0e",
+ "#2ca02c",
+ "#d62728",
+ "#9467bd",
+ "#8c564b",
+ "#e377c2",
+ "#7f7f7f",
+ "#bcbd22",
+ "#17becf",
+ "#aec7e8",
+ "#ffbb78",
+ "#98df8a",
+ "#ff9896",
+ "#c5b0d5",
+ "#c49c94",
+ "#f7b6d2",
+ "#c7c7c7",
+ "#dbdb8d",
+ "#9edae5",
];
// Model color helper function
@@ -16,96 +32,96 @@ export const getModelColor = (model, selectedModels) => {
// Enhanced Mantine theme with overridden color palettes
export const theme = createTheme({
- primaryColor: 'blue',
+ primaryColor: "blue",
colors: {
// Override Mantine's blue palette to match our theme
blue: [
- '#eff6ff', // 0 - lightest
- '#dbeafe', // 1
- '#bfdbfe', // 2
- '#93c5fd', // 3
- '#60a5fa', // 4
- '#3b82f6', // 5
- '#2563eb', // 6 - primary (default Mantine primary)
- '#1d4ed8', // 7
- '#1e40af', // 8
- '#1e3a8a', // 9 - darkest
+ "#eff6ff", // 0 - lightest
+ "#dbeafe", // 1
+ "#bfdbfe", // 2
+ "#93c5fd", // 3
+ "#60a5fa", // 4
+ "#3b82f6", // 5
+ "#2563eb", // 6 - primary (default Mantine primary)
+ "#1d4ed8", // 7
+ "#1e40af", // 8
+ "#1e3a8a", // 9 - darkest
],
-
+
// Override red palette for error states
red: [
- '#fef2f2', // 0 - lightest
- '#fee2e2', // 1
- '#fecaca', // 2
- '#fca5a5', // 3
- '#f87171', // 4
- '#ef4444', // 5
- '#dc2626', // 6 - primary red
- '#b91c1c', // 7
- '#991b1b', // 8
- '#7f1d1d', // 9 - darkest
+ "#fef2f2", // 0 - lightest
+ "#fee2e2", // 1
+ "#fecaca", // 2
+ "#fca5a5", // 3
+ "#f87171", // 4
+ "#ef4444", // 5
+ "#dc2626", // 6 - primary red
+ "#b91c1c", // 7
+ "#991b1b", // 8
+ "#7f1d1d", // 9 - darkest
],
-
+
// Override green palette for success states
green: [
- '#f0fdf4', // 0 - lightest
- '#dcfce7', // 1
- '#bbf7d0', // 2
- '#86efac', // 3
- '#4ade80', // 4
- '#22c55e', // 5
- '#16a34a', // 6 - primary green
- '#15803d', // 7
- '#166534', // 8
- '#14532d', // 9 - darkest
+ "#f0fdf4", // 0 - lightest
+ "#dcfce7", // 1
+ "#bbf7d0", // 2
+ "#86efac", // 3
+ "#4ade80", // 4
+ "#22c55e", // 5
+ "#16a34a", // 6 - primary green
+ "#15803d", // 7
+ "#166534", // 8
+ "#14532d", // 9 - darkest
],
-
+
// Override amber/yellow palette for warnings
yellow: [
- '#fffbeb', // 0 - lightest
- '#fef3c7', // 1
- '#fde68a', // 2
- '#fcd34d', // 3
- '#fbbf24', // 4
- '#f59e0b', // 5
- '#d97706', // 6 - primary amber
- '#b45309', // 7
- '#92400e', // 8
- '#78350f', // 9 - darkest
+ "#fffbeb", // 0 - lightest
+ "#fef3c7", // 1
+ "#fde68a", // 2
+ "#fcd34d", // 3
+ "#fbbf24", // 4
+ "#f59e0b", // 5
+ "#d97706", // 6 - primary amber
+ "#b45309", // 7
+ "#92400e", // 8
+ "#78350f", // 9 - darkest
],
-
+
// Override cyan palette for info states
cyan: [
- '#ecfeff', // 0 - lightest
- '#cffafe', // 1
- '#a5f3fc', // 2
- '#67e8f9', // 3
- '#22d3ee', // 4
- '#06b6d4', // 5
- '#0891b2', // 6 - primary cyan
- '#0e7490', // 7
- '#155e75', // 8
- '#164e63', // 9 - darkest
+ "#ecfeff", // 0 - lightest
+ "#cffafe", // 1
+ "#a5f3fc", // 2
+ "#67e8f9", // 3
+ "#22d3ee", // 4
+ "#06b6d4", // 5
+ "#0891b2", // 6 - primary cyan
+ "#0e7490", // 7
+ "#155e75", // 8
+ "#164e63", // 9 - darkest
],
-
+
// Override gray palette for neutral elements
gray: [
- '#f9fafb', // 0 - lightest
- '#f3f4f6', // 1
- '#e5e7eb', // 2
- '#d1d5db', // 3
- '#9ca3af', // 4
- '#6b7280', // 5
- '#4b5563', // 6 - primary gray
- '#374151', // 7
- '#1f2937', // 8
- '#111827', // 9 - darkest
+ "#f9fafb", // 0 - lightest
+ "#f3f4f6", // 1
+ "#e5e7eb", // 2
+ "#d1d5db", // 3
+ "#9ca3af", // 4
+ "#6b7280", // 5
+ "#4b5563", // 6 - primary gray
+ "#374151", // 7
+ "#1f2937", // 8
+ "#111827", // 9 - darkest
],
},
-
+
other: {
// Keep model colors available for data visualizations
modelColors: MODEL_COLORS,
getModelColor: getModelColor,
},
-});
\ No newline at end of file
+});
diff --git a/app/src/utils/datasetUtils.js b/app/src/utils/datasetUtils.js
index ecc010a5..6774e38c 100644
--- a/app/src/utils/datasetUtils.js
+++ b/app/src/utils/datasetUtils.js
@@ -1,4 +1,4 @@
-import { DATASETS } from '../config/datasets';
+import { DATASETS } from "../config/datasets";
export const getDatasetTitleFromView = (viewType) => {
if (!viewType) return null;
diff --git a/app/src/utils/forecastleInputs.js b/app/src/utils/forecastleInputs.js
index 5a2e8713..22e692e4 100644
--- a/app/src/utils/forecastleInputs.js
+++ b/app/src/utils/forecastleInputs.js
@@ -1,4 +1,4 @@
-import { FORECASTLE_CONFIG } from '../config';
+import { FORECASTLE_CONFIG } from "../config";
const buildPoissonInterval = (mean, zScore) => {
if (!Number.isFinite(mean) || mean <= 0) {
@@ -10,9 +10,16 @@ const buildPoissonInterval = (mean, zScore) => {
};
export const initialiseForecastInputs = (horizons = [], baselineValue = 0) => {
- const mean = Number.isFinite(baselineValue) && baselineValue > 0 ? baselineValue : 0;
- const interval95 = buildPoissonInterval(mean, FORECASTLE_CONFIG.confidence.zScore95);
- const interval50 = buildPoissonInterval(mean, FORECASTLE_CONFIG.confidence.zScore50);
+ const mean =
+ Number.isFinite(baselineValue) && baselineValue > 0 ? baselineValue : 0;
+ const interval95 = buildPoissonInterval(
+ mean,
+ FORECASTLE_CONFIG.confidence.zScore95,
+ );
+ const interval50 = buildPoissonInterval(
+ mean,
+ FORECASTLE_CONFIG.confidence.zScore50,
+ );
return horizons.map((horizon) => ({
horizon,
@@ -29,16 +36,28 @@ export const initialiseForecastInputs = (horizons = [], baselineValue = 0) => {
// Helper to convert from median + widths to intervals for submission
export const convertToIntervals = (entries) => {
- return entries.map(entry => ({
+ return entries.map((entry) => ({
horizon: entry.horizon,
interval50: {
// Use asymmetric bounds if available, otherwise fall back to symmetric widths
- lower: entry.lower50 !== undefined ? entry.lower50 : Math.max(0, entry.median - entry.width50),
- upper: entry.upper50 !== undefined ? entry.upper50 : entry.median + entry.width50,
+ lower:
+ entry.lower50 !== undefined
+ ? entry.lower50
+ : Math.max(0, entry.median - entry.width50),
+ upper:
+ entry.upper50 !== undefined
+ ? entry.upper50
+ : entry.median + entry.width50,
},
interval95: {
- lower: entry.lower95 !== undefined ? entry.lower95 : Math.max(0, entry.median - entry.width95),
- upper: entry.upper95 !== undefined ? entry.upper95 : entry.median + entry.width95,
+ lower:
+ entry.lower95 !== undefined
+ ? entry.lower95
+ : Math.max(0, entry.median - entry.width95),
+ upper:
+ entry.upper95 !== undefined
+ ? entry.upper95
+ : entry.median + entry.width95,
},
}));
};
diff --git a/app/src/utils/forecastleScoring.js b/app/src/utils/forecastleScoring.js
index 9d59aca9..a67cd913 100644
--- a/app/src/utils/forecastleScoring.js
+++ b/app/src/utils/forecastleScoring.js
@@ -5,7 +5,12 @@
* @returns {number} RMSE value
*/
export const calculateRMSE = (predictions, observations) => {
- if (!predictions || !observations || predictions.length === 0 || observations.length === 0) {
+ if (
+ !predictions ||
+ !observations ||
+ predictions.length === 0 ||
+ observations.length === 0
+ ) {
return null;
}
@@ -43,13 +48,19 @@ export const calculateRMSE = (predictions, observations) => {
* @returns {Object} Interval score with components {score, dispersion, underprediction, overprediction}
*/
const calculateIntervalScore = (observed, lower, upper, alpha) => {
- if (!Number.isFinite(observed) || !Number.isFinite(lower) || !Number.isFinite(upper)) {
+ if (
+ !Number.isFinite(observed) ||
+ !Number.isFinite(lower) ||
+ !Number.isFinite(upper)
+ ) {
return null;
}
const dispersion = upper - lower;
- const underprediction = observed < lower ? (2 / alpha) * (lower - observed) : 0;
- const overprediction = observed > upper ? (2 / alpha) * (observed - upper) : 0;
+ const underprediction =
+ observed < lower ? (2 / alpha) * (lower - observed) : 0;
+ const overprediction =
+ observed > upper ? (2 / alpha) * (observed - upper) : 0;
const score = dispersion + underprediction + overprediction;
return {
@@ -70,7 +81,14 @@ const calculateIntervalScore = (observed, lower, upper, alpha) => {
* @param {number} upper95 - Upper bound of 95% interval (0.975 quantile)
* @returns {Object} WIS with components {wis, dispersion, underprediction, overprediction}
*/
-export const calculateWIS = (observed, median, lower50, upper50, lower95, upper95) => {
+export const calculateWIS = (
+ observed,
+ median,
+ lower50,
+ upper50,
+ lower95,
+ upper95,
+) => {
if (!Number.isFinite(observed)) {
return null;
}
@@ -94,16 +112,24 @@ export const calculateWIS = (observed, median, lower50, upper50, lower95, upper9
// Weighted sum
const totalWeight = weight50 + weight95 + weightMedian;
- const wis = (
- weight50 * interval50.score +
- weight95 * interval95.score +
- weightMedian * medianAE
- ) / totalWeight;
+ const wis =
+ (weight50 * interval50.score +
+ weight95 * interval95.score +
+ weightMedian * medianAE) /
+ totalWeight;
// Aggregate components
- const dispersion = (weight50 * interval50.dispersion + weight95 * interval95.dispersion) / totalWeight;
- const underprediction = (weight50 * interval50.underprediction + weight95 * interval95.underprediction) / totalWeight;
- const overprediction = (weight50 * interval50.overprediction + weight95 * interval95.overprediction) / totalWeight;
+ const dispersion =
+ (weight50 * interval50.dispersion + weight95 * interval95.dispersion) /
+ totalWeight;
+ const underprediction =
+ (weight50 * interval50.underprediction +
+ weight95 * interval95.underprediction) /
+ totalWeight;
+ const overprediction =
+ (weight50 * interval50.overprediction +
+ weight95 * interval95.overprediction) /
+ totalWeight;
return {
wis,
@@ -119,9 +145,14 @@ export const calculateWIS = (observed, median, lower50, upper50, lower95, upper9
* @param {Array} horizonDates - Array of dates to extract ground truth for
* @returns {Array} Array of ground truth values matching horizonDates
*/
-export const extractGroundTruthForHorizons = (groundTruthSeries, horizonDates) => {
- const truthMap = new Map(groundTruthSeries.map(entry => [entry.date, entry.value]));
- return horizonDates.map(date => truthMap.get(date) ?? null);
+export const extractGroundTruthForHorizons = (
+ groundTruthSeries,
+ horizonDates,
+) => {
+ const truthMap = new Map(
+ groundTruthSeries.map((entry) => [entry.date, entry.value]),
+ );
+ return horizonDates.map((date) => truthMap.get(date) ?? null);
};
/**
@@ -162,7 +193,7 @@ export const scoreUserForecast = (userForecasts, groundTruthValues) => {
forecast.lower50,
forecast.upper50,
forecast.lower95,
- forecast.upper95
+ forecast.upper95,
);
if (wisResult) {
@@ -203,16 +234,16 @@ export const scoreUserForecast = (userForecasts, groundTruthValues) => {
export const getOfficialModels = (datasetKey) => {
const modelMap = {
flusight: {
- ensemble: 'FluSight-ensemble',
- baseline: 'FluSight-baseline',
+ ensemble: "FluSight-ensemble",
+ baseline: "FluSight-baseline",
},
rsv: {
- ensemble: 'RSVHub-ensemble',
- baseline: 'RSVHub-baseline',
+ ensemble: "RSVHub-ensemble",
+ baseline: "RSVHub-baseline",
},
covid19: {
- ensemble: 'CovidHub-ensemble',
- baseline: 'CovidHub-baseline',
+ ensemble: "CovidHub-ensemble",
+ baseline: "CovidHub-baseline",
},
};
@@ -235,7 +266,7 @@ export const scoreModels = (modelForecasts, horizons, groundTruthValues) => {
return;
}
- const modelForecastsRaw = horizons.map(horizon => {
+ const modelForecastsRaw = horizons.map((horizon) => {
const horizonPrediction = predictions[String(horizon)];
if (!horizonPrediction) {
return null;
@@ -252,8 +283,12 @@ export const scoreModels = (modelForecasts, horizons, groundTruthValues) => {
// Extract the required quantiles
const getQuantileValue = (targetQuantile) => {
- const index = quantiles.findIndex(q => Math.abs(q - targetQuantile) < 0.001);
- return index !== -1 && Number.isFinite(values[index]) ? values[index] : null;
+ const index = quantiles.findIndex(
+ (q) => Math.abs(q - targetQuantile) < 0.001,
+ );
+ return index !== -1 && Number.isFinite(values[index])
+ ? values[index]
+ : null;
};
const median = getQuantileValue(0.5);
@@ -262,7 +297,13 @@ export const scoreModels = (modelForecasts, horizons, groundTruthValues) => {
const lower95 = getQuantileValue(0.025);
const upper95 = getQuantileValue(0.975);
- if (median === null || lower50 === null || upper50 === null || lower95 === null || upper95 === null) {
+ if (
+ median === null ||
+ lower50 === null ||
+ upper50 === null ||
+ lower95 === null ||
+ upper95 === null
+ ) {
return null;
}
diff --git a/app/src/utils/forecastleValidation.js b/app/src/utils/forecastleValidation.js
index 9dcdb6f6..ef8f1503 100644
--- a/app/src/utils/forecastleValidation.js
+++ b/app/src/utils/forecastleValidation.js
@@ -1,7 +1,7 @@
export const validateForecastEntry = (entry) => {
const issues = [];
if (!entry) {
- return ['Missing forecast entry'];
+ return ["Missing forecast entry"];
}
const { interval50, interval95 } = entry;
const lower50 = Number(interval50.lower);
@@ -21,21 +21,27 @@ export const validateForecastEntry = (entry) => {
return true;
};
- const is50Valid = ensureFinite(lower50, '50% lower') && ensureFinite(upper50, '50% upper');
- const is95Valid = ensureFinite(lower95, '95% lower') && ensureFinite(upper95, '95% upper');
+ const is50Valid =
+ ensureFinite(lower50, "50% lower") && ensureFinite(upper50, "50% upper");
+ const is95Valid =
+ ensureFinite(lower95, "95% lower") && ensureFinite(upper95, "95% upper");
if (is50Valid && lower50 > upper50) {
- issues.push('50% upper bound must be at least as large as the lower bound');
+ issues.push("50% upper bound must be at least as large as the lower bound");
}
if (is95Valid && lower95 > upper95) {
- issues.push('95% upper bound must be at least as large as the lower bound');
+ issues.push("95% upper bound must be at least as large as the lower bound");
}
if (is50Valid && is95Valid) {
if (lower95 > lower50) {
- issues.push('95% lower bound must be less than or equal to the 50% lower bound');
+ issues.push(
+ "95% lower bound must be less than or equal to the 50% lower bound",
+ );
}
if (upper95 < upper50) {
- issues.push('95% upper bound must be greater than or equal to the 50% upper bound');
+ issues.push(
+ "95% upper bound must be greater than or equal to the 50% upper bound",
+ );
}
}
diff --git a/app/src/utils/mapUtils.js b/app/src/utils/mapUtils.js
index 424f2d56..af654940 100644
--- a/app/src/utils/mapUtils.js
+++ b/app/src/utils/mapUtils.js
@@ -1,572 +1,881 @@
export const targetDisplayNameMap = {
- 'wk inc covid hosp': 'Weekly Incident COVID-19 Hospitalizations',
- 'wk inc covid prop ed visits': "Proportion of ED Visits due to COVID-19",
- 'wk inc flu hosp': 'Weekly Incident Flu Hospitalizations',
- 'wk inc flu prop ed visits': "Proportion of ED Visits due to Flu",
- 'wk inc rsv hosp': 'Weekly Incident RSV Hospitalizations',
- 'wk inc rsv prop ed visits': 'Proportion of ED Visits due to RSV',
- 'Flu ED visits pct': 'Percent of ED Visits due to Flu',
- 'ILI ED visits pct': 'Percent of ED Visits due to Influenza-like Illness'
+ "wk inc covid hosp": "Weekly Incident COVID-19 Hospitalizations",
+ "wk inc covid prop ed visits": "Proportion of ED Visits due to COVID-19",
+ "wk inc flu hosp": "Weekly Incident Flu Hospitalizations",
+ "wk inc flu prop ed visits": "Proportion of ED Visits due to Flu",
+ "wk inc rsv hosp": "Weekly Incident RSV Hospitalizations",
+ "wk inc rsv prop ed visits": "Proportion of ED Visits due to RSV",
+ "Flu ED visits pct": "Percent of ED Visits due to Flu",
+ "ILI ED visits pct": "Percent of ED Visits due to Influenza-like Illness",
};
export const targetYAxisLabelMap = {
- 'Weekly Incident COVID-19 Hospitalizations': 'COVID-19 Hospitalizations',
- "Proportion of ED Visits due to COVID-19": "Proportion of ED Visits due to COVID-19",
- "Weekly Incident Flu Hospitalizations": 'Flu Hospitalizations',
- "Proportion of ED Visits due to Flu": "Proportion of ED Visits due to Flu",
- "Weekly Incident RSV Hospitalizations": "RSV Hospitalizations",
- "Proportion of ED Visits due to RSV": 'Proportion of ED Visits due to RSV',
- 'Percent of ED Visits due to Flu': '% of ED Visits',
- "Percent ofED Visits due to Influenza-like Illness": '% of ED Visits'
-}
+ "Weekly Incident COVID-19 Hospitalizations": "COVID-19 Hospitalizations",
+ "Proportion of ED Visits due to COVID-19":
+ "Proportion of ED Visits due to COVID-19",
+ "Weekly Incident Flu Hospitalizations": "Flu Hospitalizations",
+ "Proportion of ED Visits due to Flu": "Proportion of ED Visits due to Flu",
+ "Weekly Incident RSV Hospitalizations": "RSV Hospitalizations",
+ "Proportion of ED Visits due to RSV": "Proportion of ED Visits due to RSV",
+ "Percent of ED Visits due to Flu": "% of ED Visits",
+ "Percent ofED Visits due to Influenza-like Illness": "% of ED Visits",
+};
export const nhsnTargetsToColumnsMap = {
- 'Hospital Admissions (count)': [
- 'Total Adult COVID-19 Admissions',
- 'Total Adult Influenza Admissions',
- 'Total Adult RSV Admissions',
- 'Total COVID-19 Admissions',
- 'Total ICU Patients Hospitalized with COVID-19 ',
- 'Total ICU Patients Hospitalized with Influenza',
- 'Total ICU Patients Hospitalized with RSV',
- 'Total Influenza Admissions',
- 'Total Patients Hospitalized with COVID-19',
- 'Total Patients Hospitalized with Influenza',
- 'Total Patients Hospitalized with RSV',
- 'Total Pediatric COVID-19 Admissions',
- 'Total Pediatric Influenza Admissions',
- 'Total Pediatric RSV Admissions',
- 'Total RSV Admissions',
- 'Number of Adult COVID-19 Admissions, 18-49 years',
- 'Number of Adult COVID-19 Admissions, 50-64 years',
- 'Number of Adult COVID-19 Admissions, 65-74 years',
- 'Number of Adult COVID-19 Admissions, 75+ years',
- 'Number of Adult ICU Patients Hospitalized with COVID-19',
- 'Number of Adult ICU Patients Hospitalized with Influenza',
- 'Number of Adult ICU Patients Hospitalized with RSV',
- 'Number of Adult Influenza Admissions, 18-49 years',
- 'Number of Adult Influenza Admissions, 50-64 years',
- 'Number of Adult Influenza Admissions, 65-74 years',
- 'Number of Adult Influenza Admissions, 75+ years',
- 'Number of Adult Patients Hospitalized with COVID-19',
- 'Number of Adult Patients Hospitalized with Influenza',
- 'Number of Adult Patients Hospitalized with RSV',
- 'Number of Adult RSV Admissions, 18-49 years',
- 'Number of Adult RSV Admissions, 50-64 years',
- 'Number of Adult RSV Admissions, 65-74 years',
- 'Number of Adult RSV Admissions, 75+ years',
- 'Number of COVID-19 Admissions, unknown age',
- 'Number of Influenza Admissions, unknown age',
- 'Number of Pedatric Patients Hospitalized with Influenza',
- 'Number of Pediatric COVID-19 Admissions, 0-4 years',
- 'Number of Pediatric COVID-19 Admissions, 5-17 years',
- 'Number of Pediatric ICU Patients Hospitalized with COVID-19',
- 'Number of Pediatric ICU Patients Hospitalized with Influenza',
- 'Number of Pediatric ICU Patients Hospitalized with RSV',
- 'Number of Pediatric Influenza Admissions, 0-4 years',
- 'Number of Pediatric Influenza Admissions, 5-17 years',
- 'Number of Pediatric Patients Hospitalized with COVID-19',
- 'Number of Pediatric Patients Hospitalized with RSV',
- 'Number of Pediatric RSV Admissions, 0-4 years',
- 'Number of Pediatric RSV Admissions, 5-17 years',
- 'Number of RSV Admissions, unknown age',
- ],
- 'Hospital Admissions (rates)': [
- 'Total Number of Adult COVID-19 Admissions per 100,000 population',
- 'Total Number of Adult Influenza Admissions per 100,000 population',
- 'Total Number of Adult RSV Admissions per 100,000 population',
- 'Total Number of Pediatric COVID-19 Admissions per 100,000 population',
- 'Total Number of Pediatric Influenza Admissions per 100,000 population',
- 'Total Number of Pediatric RSV Admissions per 100,000 population',
- 'Total number of COVID-19 Admissions per 100,000 population',
- 'Total number of Influenza Admissions per 100,000 population',
- 'Total number of RSV Admissions per 100,000 population',
- 'Number of Adult COVID-19 Admissions, 18-49 years, per 100,000 population',
- 'Number of Adult COVID-19 Admissions, 50-64 years, per 100,000 population',
- 'Number of Adult COVID-19 Admissions, 65-74 years, per 100,000 population',
- 'Number of Adult COVID-19 Admissions, 75+ years, per 100,000 population',
- 'Number of Adult Influenza Admissions, 18-49 years, per 100,000 population',
- 'Number of Adult Influenza Admissions, 50-64 years, per 100,000 population',
- 'Number of Adult Influenza Admissions, 65-74 years, per 100,000 population',
- 'Number of Adult Influenza Admissions, 75+ years, per 100,000 population',
- 'Number of Adult RSV Admissions, 18-49 years, per 100,000 population',
- 'Number of Adult RSV Admissions, 50-64 years, per 100,000 population',
- 'Number of Adult RSV Admissions, 65-74 years, per 100,000 population',
- 'Number of Adult RSV Admissions, 75+ years, per 100,000 population',
- 'Number of Pediatric COVID-19 Admissions, 0-4 years, per 100,000 population',
- 'Number of Pediatric COVID-19 Admissions, 5-17 years, per 100,000 population',
- 'Number of Pediatric Influenza Admissions, 0-4 years, per 100,000 population',
- 'Number of Pediatric Influenza Admissions, 5-17 years, per 100,000 population',
- 'Number of Pediatric RSV Admissions, 0-4 years, per 100,000 population',
- 'Number of Pediatric RSV Admissions, 5-17 years, per 100,000 population',
- ],
- 'Hospital Admissions (%)': [
- 'Percent Adult COVID-19 Admissions',
- 'Percent Adult Influenza Admissions',
- 'Percent Adult RSV Admissions',
- 'Percent Pediatric COVID-19 Admissions',
- 'Percent Pediatric Influenza Admissions',
- 'Percent Pediatric RSV Admissions',
- ],
- 'Bed Capacity (count)': [
- 'Number of Adult ICU Beds',
- 'Number of Adult ICU Beds Occupied',
- 'Number of Adult Inpatient Beds',
- 'Number of Adult Inpatient Beds Occupied',
- 'Number of ICU Beds',
- 'Number of ICU Beds Occupied',
- 'Number of Inpatient Beds',
- 'Number of Inpatient Beds Occupied',
- 'Number of Pediatric ICU Beds',
- 'Number of Pediatric ICU Beds Occupied',
- 'Number of Pediatric Inpatient Beds Occupied',
- 'Number of Pediatric Inpatient beds'
- ],
- 'Bed Capacity (%)': [
- 'Percent ICU Beds Occupied',
- 'Percent ICU Beds Occupied by COVID-19 Patients',
- 'Percent ICU Beds Occupied by Influenza Patients',
- 'Percent ICU Beds Occupied by RSV Patients',
- 'Percent Inpatient Beds Occupied',
- 'Percent Inpatient Beds Occupied by COVID-19 Patients',
- 'Percent Inpatient Beds Occupied by Influenza Patients',
- 'Percent Inpatient Beds Occupied by RSV Patients',
- 'Percent Adult Inpatient Beds Occupied',
- 'Percent Pediatric Inpatient Beds Occupied',
- 'Percent Adult ICU Beds Occupied',
- ]
-}
+ "Hospital Admissions (count)": [
+ "Total Adult COVID-19 Admissions",
+ "Total Adult Influenza Admissions",
+ "Total Adult RSV Admissions",
+ "Total COVID-19 Admissions",
+ "Total ICU Patients Hospitalized with COVID-19 ",
+ "Total ICU Patients Hospitalized with Influenza",
+ "Total ICU Patients Hospitalized with RSV",
+ "Total Influenza Admissions",
+ "Total Patients Hospitalized with COVID-19",
+ "Total Patients Hospitalized with Influenza",
+ "Total Patients Hospitalized with RSV",
+ "Total Pediatric COVID-19 Admissions",
+ "Total Pediatric Influenza Admissions",
+ "Total Pediatric RSV Admissions",
+ "Total RSV Admissions",
+ "Number of Adult COVID-19 Admissions, 18-49 years",
+ "Number of Adult COVID-19 Admissions, 50-64 years",
+ "Number of Adult COVID-19 Admissions, 65-74 years",
+ "Number of Adult COVID-19 Admissions, 75+ years",
+ "Number of Adult ICU Patients Hospitalized with COVID-19",
+ "Number of Adult ICU Patients Hospitalized with Influenza",
+ "Number of Adult ICU Patients Hospitalized with RSV",
+ "Number of Adult Influenza Admissions, 18-49 years",
+ "Number of Adult Influenza Admissions, 50-64 years",
+ "Number of Adult Influenza Admissions, 65-74 years",
+ "Number of Adult Influenza Admissions, 75+ years",
+ "Number of Adult Patients Hospitalized with COVID-19",
+ "Number of Adult Patients Hospitalized with Influenza",
+ "Number of Adult Patients Hospitalized with RSV",
+ "Number of Adult RSV Admissions, 18-49 years",
+ "Number of Adult RSV Admissions, 50-64 years",
+ "Number of Adult RSV Admissions, 65-74 years",
+ "Number of Adult RSV Admissions, 75+ years",
+ "Number of COVID-19 Admissions, unknown age",
+ "Number of Influenza Admissions, unknown age",
+ "Number of Pedatric Patients Hospitalized with Influenza",
+ "Number of Pediatric COVID-19 Admissions, 0-4 years",
+ "Number of Pediatric COVID-19 Admissions, 5-17 years",
+ "Number of Pediatric ICU Patients Hospitalized with COVID-19",
+ "Number of Pediatric ICU Patients Hospitalized with Influenza",
+ "Number of Pediatric ICU Patients Hospitalized with RSV",
+ "Number of Pediatric Influenza Admissions, 0-4 years",
+ "Number of Pediatric Influenza Admissions, 5-17 years",
+ "Number of Pediatric Patients Hospitalized with COVID-19",
+ "Number of Pediatric Patients Hospitalized with RSV",
+ "Number of Pediatric RSV Admissions, 0-4 years",
+ "Number of Pediatric RSV Admissions, 5-17 years",
+ "Number of RSV Admissions, unknown age",
+ ],
+ "Hospital Admissions (rates)": [
+ "Total Number of Adult COVID-19 Admissions per 100,000 population",
+ "Total Number of Adult Influenza Admissions per 100,000 population",
+ "Total Number of Adult RSV Admissions per 100,000 population",
+ "Total Number of Pediatric COVID-19 Admissions per 100,000 population",
+ "Total Number of Pediatric Influenza Admissions per 100,000 population",
+ "Total Number of Pediatric RSV Admissions per 100,000 population",
+ "Total number of COVID-19 Admissions per 100,000 population",
+ "Total number of Influenza Admissions per 100,000 population",
+ "Total number of RSV Admissions per 100,000 population",
+ "Number of Adult COVID-19 Admissions, 18-49 years, per 100,000 population",
+ "Number of Adult COVID-19 Admissions, 50-64 years, per 100,000 population",
+ "Number of Adult COVID-19 Admissions, 65-74 years, per 100,000 population",
+ "Number of Adult COVID-19 Admissions, 75+ years, per 100,000 population",
+ "Number of Adult Influenza Admissions, 18-49 years, per 100,000 population",
+ "Number of Adult Influenza Admissions, 50-64 years, per 100,000 population",
+ "Number of Adult Influenza Admissions, 65-74 years, per 100,000 population",
+ "Number of Adult Influenza Admissions, 75+ years, per 100,000 population",
+ "Number of Adult RSV Admissions, 18-49 years, per 100,000 population",
+ "Number of Adult RSV Admissions, 50-64 years, per 100,000 population",
+ "Number of Adult RSV Admissions, 65-74 years, per 100,000 population",
+ "Number of Adult RSV Admissions, 75+ years, per 100,000 population",
+ "Number of Pediatric COVID-19 Admissions, 0-4 years, per 100,000 population",
+ "Number of Pediatric COVID-19 Admissions, 5-17 years, per 100,000 population",
+ "Number of Pediatric Influenza Admissions, 0-4 years, per 100,000 population",
+ "Number of Pediatric Influenza Admissions, 5-17 years, per 100,000 population",
+ "Number of Pediatric RSV Admissions, 0-4 years, per 100,000 population",
+ "Number of Pediatric RSV Admissions, 5-17 years, per 100,000 population",
+ ],
+ "Hospital Admissions (%)": [
+ "Percent Adult COVID-19 Admissions",
+ "Percent Adult Influenza Admissions",
+ "Percent Adult RSV Admissions",
+ "Percent Pediatric COVID-19 Admissions",
+ "Percent Pediatric Influenza Admissions",
+ "Percent Pediatric RSV Admissions",
+ ],
+ "Bed Capacity (count)": [
+ "Number of Adult ICU Beds",
+ "Number of Adult ICU Beds Occupied",
+ "Number of Adult Inpatient Beds",
+ "Number of Adult Inpatient Beds Occupied",
+ "Number of ICU Beds",
+ "Number of ICU Beds Occupied",
+ "Number of Inpatient Beds",
+ "Number of Inpatient Beds Occupied",
+ "Number of Pediatric ICU Beds",
+ "Number of Pediatric ICU Beds Occupied",
+ "Number of Pediatric Inpatient Beds Occupied",
+ "Number of Pediatric Inpatient beds",
+ ],
+ "Bed Capacity (%)": [
+ "Percent ICU Beds Occupied",
+ "Percent ICU Beds Occupied by COVID-19 Patients",
+ "Percent ICU Beds Occupied by Influenza Patients",
+ "Percent ICU Beds Occupied by RSV Patients",
+ "Percent Inpatient Beds Occupied",
+ "Percent Inpatient Beds Occupied by COVID-19 Patients",
+ "Percent Inpatient Beds Occupied by Influenza Patients",
+ "Percent Inpatient Beds Occupied by RSV Patients",
+ "Percent Adult Inpatient Beds Occupied",
+ "Percent Pediatric Inpatient Beds Occupied",
+ "Percent Adult ICU Beds Occupied",
+ ],
+};
// longform:shortform, this may have random column names that don't actually exist
export const nhsnNameToSlugMap = {
- 'Week Ending Date': 'weekendingdate',
- 'Geographic aggregation': 'jurisdiction',
- 'Number of Inpatient Beds': 'numinptbeds',
- 'Number of Adult Inpatient Beds': 'numinptbedsadult',
- 'Number of Pediatric Inpatient beds': 'numinptbedsped',
- 'Number of Inpatient Beds Occupied': 'numinptbedsocc',
- 'Number of Adult Inpatient Beds Occupied': 'numinptbedsoccadult',
- 'Number of Pediatric Inpatient Beds Occupied': 'numinptbedsoccped',
- 'Number of ICU Beds': 'numicubeds',
- 'Number of Adult ICU Beds': 'numicubedsadult',
- 'Number of Pediatric ICU Beds': 'numicubedsped',
- 'Number of ICU Beds Occupied': 'numicubedsocc',
- 'Number of Adult ICU Beds Occupied': 'numicubedsoccadult',
- 'Number of Pediatric ICU Beds Occupied': 'numicubedsoccped',
- 'Number of Adult Patients Hospitalized with COVID-19': 'numconfc19hosppatsadult',
- 'Number of Pediatric Patients Hospitalized with COVID-19': 'numconfc19hosppatsped',
- 'Total Patients Hospitalized with COVID-19': 'totalconfc19hosppats',
- 'Number of Adult Patients Hospitalized with Influenza': 'numconffluhosppatsadult',
- 'Number of Pedatric Patients Hospitalized with Influenza': 'numconffluhosppatsped',
- 'Total Patients Hospitalized with Influenza': 'totalconffluhosppats',
- 'Number of Adult Patients Hospitalized with RSV': 'numconfrsvhosppatsadult',
- 'Number of Pediatric Patients Hospitalized with RSV': 'numconfrsvhosppatsped',
- 'Total Patients Hospitalized with RSV': 'totalconfrsvhosppats',
- 'Number of Adult ICU Patients Hospitalized with COVID-19': 'numconfc19icupatsadult',
- 'Number of Pediatric ICU Patients Hospitalized with COVID-19': 'numconfc19icupatsped',
- 'Total ICU Patients Hospitalized with COVID-19 ': 'totalconfc19icupats',
- 'Number of Adult ICU Patients Hospitalized with Influenza': 'numconffluicupatsadult',
- 'Number of Pediatric ICU Patients Hospitalized with Influenza': 'numconffluicupatsped',
- 'Total ICU Patients Hospitalized with Influenza': 'totalconffluicupats',
- 'Number of Adult ICU Patients Hospitalized with RSV': 'numconfrsvicupatsadult',
- 'Number of Pediatric ICU Patients Hospitalized with RSV': 'numconfrsvicupatsped',
- 'Total ICU Patients Hospitalized with RSV': 'totalconfrsvicupats',
- 'Number of Pediatric COVID-19 Admissions, 0-4 years': 'numconfc19newadmped0to4',
- 'Number of Pediatric COVID-19 Admissions, 5-17 years': 'numconfc19newadmped5to17',
- 'Total Pediatric COVID-19 Admissions': 'totalconfc19newadmped',
- 'Number of Adult COVID-19 Admissions, 18-49 years': 'numconfc19newadmadult18to49',
- 'Number of Adult COVID-19 Admissions, 50-64 years': 'numconfc19newadmadult50to64',
- 'Number of Adult COVID-19 Admissions, 65-74 years': 'numconfc19newadmadult65to74',
- 'Number of Adult COVID-19 Admissions, 75+ years': 'numconfc19newadmadult75plus',
- 'Total Adult COVID-19 Admissions': 'totalconfc19newadmadult',
- 'Number of COVID-19 Admissions, unknown age': 'numconfc19newadmunk',
- 'Total COVID-19 Admissions': 'totalconfc19newadm',
- 'Number of Pediatric Influenza Admissions, 0-4 years': 'numconfflunewadmped0to4',
- 'Number of Pediatric Influenza Admissions, 5-17 years': 'numconfflunewadmped5to17',
- 'Total Pediatric Influenza Admissions': 'totalconfflunewadmped',
- 'Number of Adult Influenza Admissions, 18-49 years': 'numconfflunewadmadult18to49',
- 'Number of Adult Influenza Admissions, 50-64 years': 'numconfflunewadmadult50to64',
- 'Number of Adult Influenza Admissions, 65-74 years': 'numconfflunewadmadult65to74',
- 'Number of Adult Influenza Admissions, 75+ years': 'numconfflunewadmadult75plus',
- 'Total Adult Influenza Admissions': 'totalconfflunewadmadult',
- 'Number of Influenza Admissions, unknown age': 'numconfflunewadmunk',
- 'Total Influenza Admissions': 'totalconfflunewadm',
- 'Number of Pediatric RSV Admissions, 0-4 years': 'numconfrsvnewadmped0to4',
- 'Number of Pediatric RSV Admissions, 5-17 years': 'numconfrsvnewadmped5to17',
- 'Total Pediatric RSV Admissions': 'totalconfrsvnewadmped',
- 'Number of Adult RSV Admissions, 18-49 years': 'numconfrsvnewadmadult18to49',
- 'Number of Adult RSV Admissions, 50-64 years': 'numconfrsvnewadmadult50to64',
- 'Number of Adult RSV Admissions, 65-74 years': 'numconfrsvnewadmadult65to74',
- 'Number of Adult RSV Admissions, 75+ years': 'numconfrsvnewadmadult75plus',
- 'Total Adult RSV Admissions': 'totalconfrsvnewadmadult',
- 'Number of RSV Admissions, unknown age': 'numconfrsvnewadmunk',
- 'Total RSV Admissions': 'totalconfrsvnewadm',
- 'Percent Inpatient Beds Occupied': 'pctinptbedsocc',
- 'Percent Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbeds',
- 'Percent Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbeds',
- 'Percent Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbeds',
- 'Percent ICU Beds Occupied': 'pcticubedsocc',
- 'Percent ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubeds',
- 'Percent ICU Beds Occupied by Influenza Patients': 'pctconffluicubeds',
- 'Percent ICU Beds Occupied by RSV Patients': 'pctconfrsvicubeds',
- 'Percent Adult COVID-19 Admissions': 'pctconfc19newadmadult',
- 'Percent Pediatric COVID-19 Admissions': 'pctconfc19newadmped',
- 'Percent Adult Influenza Admissions': 'pctconfflunewadmadult',
- 'Percent Pediatric Influenza Admissions': 'pctconfflunewadmped',
- 'Percent Adult RSV Admissions': 'pctconfrsvnewadmadult',
- 'Percent Pediatric RSV Admissions': 'pctconfrsvnewadmped',
- 'Number Hospitals Reporting Number of Inpatient Beds': 'numinptbedshosprep',
- 'Number Hospitals Reporting Number of Inpatient Beds Occupied': 'numinptbedsocchosprep',
- 'Number Hospitals Reporting Number of ICU Beds ': 'numicubedshosprep',
- 'Number Hospitals Reporting Number of ICU Beds Occupied': 'numicubedsocchosprep',
- 'Number Hospitals Reporting Total Patients Hospitalized with COVID-19': 'totalconfc19hosppatshosprep',
- 'Number Hospitals Reporting TotalPatients Hospitalized with Influenza': 'totalconffluhosppatshosprep',
- 'Number Hospitals Reporting Total Patients Hospitalized with RSV': 'totalconfrsvhosppatshosprep',
- 'Number Hospitals Reporting ICU Patients Hospitalized with COVID-19 ': 'totalconfc19icupatshosprep',
- 'Number Hospitals Reporting ICU Patients Hospitalized with Influenza': 'totalconffluicupatshosprep',
- 'Number Hospitals Reporting ICU Patients Hospitalized with RSV': 'totalconfrsvicupatshosprep',
- 'Number Hospitals Reporting Pediatric COVID-19 Admissions': 'totalconfc19newadmpedhosprep',
- 'Number Hospitals Reporting Adult COVID-19 Admissions': 'totalconfc19newadmadulthosprep',
- 'Number Hospitals Reporting COVID-19 Admissions': 'totalconfc19newadmhosprep',
- 'Number Hospitals Reporting Pediatric Influenza Admissions': 'totalconfflunewadmpedhosprep',
- 'Number Hospitals Reporting Adult Influenza Admissions': 'totalconfflunewadmadulthosprep',
- 'Number Hospitals Reporting Influenza Admissions': 'totalconfflunewadmhosprep',
- 'Number Hospitals Reporting Pediatric RSV Admissions': 'totalconfrsvnewadmpedhosprep',
- 'Number Hospitals Reporting Adult RSV Admissions': 'totalconfrsvnewadmadulthosprep',
- 'Number Hospitals Reporting RSV Admissions': 'totalconfrsvnewadmhosprep',
- 'Number Hospitals Reporting Percent Inpatient Beds Occupied': 'pctinptbedsocchosprep',
- 'Number Hospitals Reporting Percent ICU Beds Occupied': 'pcticubedsocchosprep',
- 'Number Hospitals Reporting Percent Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbedshosprep',
- 'Number Hospitals Reporting Percent Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbedshosprep',
- 'Number Hospitals Reporting Percent Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbedshosprep',
- 'Number Hospitals Reporting Percent ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubedshosprep',
- 'Number Hospitals Reporting Percent ICU Beds Occupied by Influenza Patients': 'pctconffluicubedshosprep',
- 'Number Hospitals Reporting Percent ICU Beds Occupied by RSV Patients': 'pctconfrsvicubedshosprep',
- 'Percent Hospitals Reporting Number of Inpatient Beds': 'numinptbedsperchosprep',
- 'Percent Hospitals Reporting Number of Inpatient Beds Occupied': 'numinptbedsoccperchosprep',
- 'Percent Hospitals Reporting Number of ICU Beds ': 'numicubedsperchosprep',
- 'Percent Hospitals Reporting Number of ICU Beds Occupied': 'numicubedsoccperchosprep',
- 'Percent Hospitals Reporting Total Patients Hospitalized with COVID-19': 'totalconfc19hosppatsperc',
- 'Percent Hospitals Reporting TotalPatients Hospitalized with Influenza': 'totalconffluhosppatsperc',
- 'Percent Hospitals Reporting Total Patients Hospitalized with RSV': 'totalconfrsvhosppatsperc',
- 'Percent Hospitals Reporting ICU Patients Hospitalized with COVID-19 ': 'totalconfc19icupatsperchosprep',
- 'Percent Hospitals Reporting ICU Patients Hospitalized with Influenza': 'totalconffluicupatsperchosprep',
- 'Percent Hospitals Reporting ICU Patients Hospitalized with RSV': 'totalconfrsvicupatsperchosprep',
- 'Percent Hospitals Reporting Pediatric COVID-19 Admissions': 'totalconfc19newadmpedper',
- 'Percent Hospitals Reporting Adult COVID-19 Admissions': 'totalconfc19newadmadultp',
- 'Percent Hospitals Reporting COVID-19 Admissions': 'totalconfc19newadmperchosprep',
- 'Percent Hospitals Reporting Pediatric Influenza Admissions': 'totalconfflunewadmpedper',
- 'Percent Hospitals Reporting Adult Influenza Admissions': 'totalconfflunewadmadultp',
- 'Percent Hospitals Reporting Influenza Admissions': 'totalconfflunewadmperchosprep',
- 'Percent Hospitals Reporting Pediatric RSV Admissions': 'totalconfrsvnewadmpedper',
- 'Percent Hospitals Reporting Adult RSV Admissions': 'totalconfrsvnewadmadultp',
- 'Percent Hospitals Reporting RSV Admissions': 'totalconfrsvnewadmperchosprep',
- 'Percent Hospitals Reporting Percent Inpatient Beds Occupied': 'pctinptbedsoccperchosprep',
- 'Percent Hospitals Reporting Percent ICU Beds Occupied': 'pcticubedsoccperchosprep',
- 'Percent Hospitals Reporting Percent Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbedsperchosprep',
- 'Percent Hospitals Reporting Percent Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbedsperchosprep',
- 'Percent Hospitals Reporting Percent Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbedsperchosprep',
- 'Percent Hospitals Reporting Percent ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubedsperchosprep',
- 'Percent Hospitals Reporting Percent ICU Beds Occupied by Influenza Patients': 'pctconffluicubedsperchosprep',
- 'Percent Hospitals Reporting Percent ICU Beds Occupied by RSV Patients': 'pctconfrsvicubedsperchosprep',
- 'Absolute Change in the Percent Hospitals Reporting Number of Inpatient Beds from Prior Week': 'numinptbedsperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Number of Inpatient Beds Occupied from Prior Week': 'numinptbedsoccperchospre',
- 'Absolute Change in the Percent Hospitals Reporting Number of ICU Beds from Prior Week': 'numicubedsperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Number of ICU Beds Occupied from Prior Week': 'numicubedsoccperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Total Patients Hospitalized with COVID-19 from Prior Week': 'totalconfc19hosppatsperc_1',
- 'Absolute Change in the Percent Hospitals Reporting TotalPatients Hospitalized with Influenza from Prior Week': 'totalconffluhosppatsperc_1',
- 'Absolute Change in the Percent Hospitals Reporting Total Patients Hospitalized with RSV from Prior Week': 'totalconfrsvhosppatsperc_1',
- 'Absolute Change in the Percent Hospitals Reporting ICU Patients Hospitalized with COVID-19 from Prior Week': 'totalconfc19icupatsperch',
- 'Absolute Change in the Percent Hospitals Reporting ICU Patients Hospitalized with Influenza from Prior Week': 'totalconffluicupatsperch',
- 'Absolute Change in the Percent Hospitals Reporting ICU Patients Hospitalized with RSV from Prior Week': 'totalconfrsvicupatsperch',
- 'Absolute Change in the Percent Hospitals Reporting Pediatric COVID-19 Admissions from Prior Week': 'totalconfc19newadmpedper_1',
- 'Absolute Change in the Percent Hospitals Reporting Adult COVID-19 Admissions from Prior Week': 'totalconfc19newadmadultp_1',
- 'Absolute Change in the Percent Hospitals Reporting COVID-19 Admissions from Prior Week': 'totalconfc19newadmpercho',
- 'Absolute Change in the Percent Hospitals Reporting Pediatric Influenza Admissions from Prior Week': 'totalconfflunewadmpedper_1',
- 'Absolute Change in the Percent Hospitals Reporting Adult Influenza Admissions from Prior Week': 'totalconfflunewadmadultp_1',
- 'Absolute Change in the Percent Hospitals Reporting Influenza Admissions from Prior Week': 'totalconfflunewadmpercho',
- 'Absolute Change in the Percent Hospitals Reporting Pediatric RSV Admissions from Prior Week': 'totalconfrsvnewadmpedper_1',
- 'Absolute Change in the Percent Hospitals Reporting Adult RSV Admissions from Prior Week': 'totalconfrsvnewadmadultp_1',
- 'Absolute Change in the Percent Hospitals Reporting RSV Admissions from Prior Week': 'totalconfrsvnewadmpercho',
- 'Absolute Change in the Percent Hospitals Reporting Percent Inpatient Beds Occupied from Prior Week': 'pctinptbedsoccperchospre',
- 'Absolute Change in the Percent Hospitals Reporting Percent ICU Beds Occupied from Prior Week': 'pcticubedsoccperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Inpatient Beds Occupied by COVID-19 Patients from Prior Week': 'pctconfc19inptbedspercho',
- 'Absolute Change in the Percent Hospitals Reporting Percent Inpatient Beds Occupied by Influenza Patients from Prior Week': 'pctconffluinptbedspercho',
- 'Absolute Change in the Percent Hospitals Reporting Percent Inpatient Beds Occupied by RSV Patients from Prior Week': 'pctconfrsvinptbedspercho',
- 'Absolute Change in the Percent Hospitals Reporting Percent ICU Beds Occupied by COVID-19 Patients from Prior Week': 'pctconfc19icubedsperchos',
- 'Absolute Change in the Percent Hospitals Reporting Percent ICU Beds Occupied by Influenza Patients from Prior Week': 'pctconffluicubedsperchos',
- 'Absolute Change in the Percent Hospitals Reporting Percent ICU Beds Occupied by RSV Patients from Prior Week': 'pctconfrsvicubedsperchos',
- 'Number of Pediatric COVID-19 Admissions, 0-4 years, per 100,000 population': 'numconfc19newadmped0to4per100k',
- 'Number of Pediatric COVID-19 Admissions, 5-17 years, per 100,000 population': 'numconfc19newadmped5to17per100k',
- 'Total Number of Pediatric COVID-19 Admissions per 100,000 population': 'totalconfc19newadmpedper100k',
- 'Number of Adult COVID-19 Admissions, 18-49 years, per 100,000 population': 'numconfc19newadmadult18to49per100k',
- 'Number of Adult COVID-19 Admissions, 50-64 years, per 100,000 population': 'numconfc19newadmadult50to64per100k',
- 'Number of Adult COVID-19 Admissions, 65-74 years, per 100,000 population': 'numconfc19newadmadult65to74per100k',
- 'Number of Adult COVID-19 Admissions, 75+ years, per 100,000 population': 'numconfc19newadmadult75plusper100k',
- 'Total Number of Adult COVID-19 Admissions per 100,000 population': 'totalconfc19newadmadultper100k',
- 'Total number of COVID-19 Admissions per 100,000 population': 'totalconfc19newadmper100k',
- 'Number of Pediatric Influenza Admissions, 0-4 years, per 100,000 population': 'numconfflunewadmped0to4per100k',
- 'Number of Pediatric Influenza Admissions, 5-17 years, per 100,000 population': 'numconfflunewadmped5to17per100k',
- 'Total Number of Pediatric Influenza Admissions per 100,000 population': 'totalconfflunewadmpedper100k',
- 'Number of Adult Influenza Admissions, 18-49 years, per 100,000 population': 'numconfflunewadmadult18to49per100k',
- 'Number of Adult Influenza Admissions, 50-64 years, per 100,000 population': 'numconfflunewadmadult50to64per100k',
- 'Number of Adult Influenza Admissions, 65-74 years, per 100,000 population': 'numconfflunewadmadult65to74per100k',
- 'Number of Adult Influenza Admissions, 75+ years, per 100,000 population': 'numconfflunewadmadult75plusper100k',
- 'Total Number of Adult Influenza Admissions per 100,000 population': 'totalconfflunewadmadultper100k',
- 'Total number of Influenza Admissions per 100,000 population': 'totalconfflunewadmper100k',
- 'Number of Pediatric RSV Admissions, 0-4 years, per 100,000 population': 'numconfrsvnewadmped0to4per100k',
- 'Number of Pediatric RSV Admissions, 5-17 years, per 100,000 population': 'numconfrsvnewadmped5to17per100k',
- 'Total Number of Pediatric RSV Admissions per 100,000 population': 'totalconfrsvnewadmpedper100k',
- 'Number of Adult RSV Admissions, 18-49 years, per 100,000 population': 'numconfrsvnewadmadult18to49per100k',
- 'Number of Adult RSV Admissions, 50-64 years, per 100,000 population': 'numconfrsvnewadmadult50to64per100k',
- 'Number of Adult RSV Admissions, 65-74 years, per 100,000 population': 'numconfrsvnewadmadult65to74per100k',
- 'Number of Adult RSV Admissions, 75+ years, per 100,000 population': 'numconfrsvnewadmadult75plusper100k',
- 'Total Number of Adult RSV Admissions per 100,000 population': 'totalconfrsvnewadmadultper100k',
- 'Total number of RSV Admissions per 100,000 population': 'totalconfrsvnewadmper100k',
- 'Percent Hospitals Reporting Total New COVID-19 Admissions Above 80%': 'totalconfc19newadmperchosprepabove80pct',
- 'Percent Hospitals Reporting Total New COVID-19 Admissions Above 90%': 'totalconfc19newadmperchosprepabove90pct',
- 'Percent Hospitals Reporting Total New Influenza Admissions Above 80%': 'totalconfflunewadmperchosprepabove80pct',
- 'Percent Hospitals Reporting Total New Influenza Admissions Above 90%': 'totalconfflunewadmperchosprepabove90pct',
- 'Percent Hospitals Reporting Total New RSV Admissions Above 80%': 'totalconfrsvnewadmperchosprepabove80pct',
- 'Percent Hospitals Reporting Total New RSV Admissions Above 90%': 'totalconfrsvnewadmperchosprepabove90pct',
- 'Percent Adult Inpatient Beds Occupied': 'pctinptbedsoccadult',
- 'Percent Pediatric Inpatient Beds Occupied': 'pctinptbedsoccped',
- 'Percent Adult ICU Beds Occupied': 'pcticubedsoccadult',
- 'Percent Pediatric ICU Beds Occupied': 'pcticubedsoccped',
- 'Percent Adult Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbedsadult',
- 'Percent Pediatric Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbedsped',
- 'Percent Adult ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubedsadult',
- 'Percent Pediatric ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubedsped',
- 'Percent Adult Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbedsadult',
- 'Percent Pediatric Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbedsped',
- 'Percent Adult ICU Beds Occupied by Influenza Patients': 'pctconffluicubedsadult',
- 'Percent Pediatric ICU Beds Occupied by Influenza Patients': 'pctconffluicubedsped',
- 'Percent Adult Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbedsadult',
- 'Percent Pediatric Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbedsped',
- 'Percent Adult ICU Beds Occupied by RSV Patients': 'pctconfrsvicubedsadult',
- 'Percent Pediatric ICU Beds Occupied by RSV Patients': 'pctconfrsvicubedsped',
- 'Percent Hospitalized Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicu',
- 'Percent Hospitalized Adult Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicuadult',
- 'Percent Hospitalized Pediatric Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicuped',
- 'Percent Hospitalized Patients with Influenza in the ICU': 'pctconffluhosppatsicu',
- 'Percent Hospitalized Adult Patients with Influenza in the ICU': 'pctconffluhosppatsicuadult',
- 'Percent Hospitalized Pediatric Patients with Influenza in the ICU': 'pctconffluhosppatsicuped',
- 'Percent Hospitalized Patients with RSV in the ICU': 'pctconfrsvhosppatsicu',
- 'Percent Hospitalized Adult Patients with RSV in the ICU': 'pctconfrsvhosppatsicuadult',
- 'Percent Hospitalized Pediatric Patients with RSV in the ICU': 'pctconfrsvhosppatsicuped',
- 'Percent Change in the Number of Pediatric COVID-19 Admissions, 0-4 years from Prior Week': 'numconfc19newadmped0to4pctchg',
- 'Percent Change in the Number of Pediatric COVID-19 Admissions, 5-17 years from Prior Week': 'numconfc19newadmped5to17pctchg',
- 'Percent Change in the Total Pediatric COVID-19 Admissions from Prior Week': 'totalconfc19newadmpedpctchg',
- 'Percent Change in the Number of Adult COVID-19 Admissions, 18-49 years from Prior Week': 'numconfc19newadmadult18to49pctchg',
- 'Percent Change in the Number of Adult COVID-19 Admissions, 50-64 years from Prior Week': 'numconfc19newadmadult50to64pctchg',
- 'Percent Change in the Number of Adult COVID-19 Admissions, 65-74 years from Prior Week': 'numconfc19newadmadult65to74pctchg',
- 'Percent Change in the Number of Adult COVID-19 Admissions, 75+ years from Prior Week': 'numconfc19newadmadult75pluspctchg',
- 'Percent Change in the Total Adult COVID-19 Admissions from Prior Week': 'totalconfc19newadmadultpctchg',
- 'Percent Change in the Total COVID-19 Admissions from Prior Week': 'totalconfc19newadmpctchg',
- 'Percent Change in the Number of Pediatric Influenza Admissions, 0-4 years from Prior Week': 'numconfflunewadmped0to4pctchg',
- 'Percent Change in the Number of Pediatric Influenza Admissions, 5-17 years from Prior Week': 'numconfflunewadmped5to17pctchg',
- 'Percent Change in the Total Pediatric Influenza Admissions from Prior Week': 'totalconfflunewadmpedpctchg',
- 'Percent Change in the Number of Adult Influenza Admissions, 18-49 years from Prior Week': 'numconfflunewadmadult18to49pctchg',
- 'Percent Change in the Number of Adult Influenza Admissions, 50-64 years from Prior Week': 'numconfflunewadmadult50to64pctchg',
- 'Percent Change in the Number of Adult Influenza Admissions, 65-74 years from Prior Week': 'numconfflunewadmadult65to74pctchg',
- 'Percent Change in the Number of Adult Influenza Admissions, 75+ years from Prior Week': 'numconfflunewadmadult75pluspctchg',
- 'Percent Change in the Total Adult Influenza Admissions from Prior Week': 'totalconfflunewadmadultpctchg',
- 'Percent Change in the Total Influenza Admissions from Prior Week': 'totalconfflunewadmpctchg',
- 'Percent Change in the Number of Pediatric RSV Admissions, 0-4 years from Prior Week': 'numconfrsvnewadmped0to4pctchg',
- 'Percent Change in the Number of Pediatric RSV Admissions, 5-17 years from Prior Week': 'numconfrsvnewadmped5to17pctchg',
- 'Percent Change in the Total Pediatric RSV Admissions from Prior Week': 'totalconfrsvnewadmpedpctchg',
- 'Percent Change in the Number of Adult RSV Admissions, 18-49 years from Prior Week': 'numconfrsvnewadmadult18to49pctchg',
- 'Percent Change in the Number of Adult RSV Admissions, 50-64 years from Prior Week': 'numconfrsvnewadmadult50to64pctchg',
- 'Percent Change in the Number of Adult RSV Admissions, 65-74 years from Prior Week': 'numconfrsvnewadmadult65to74pctchg',
- 'Percent Change in the Number of Adult RSV Admissions, 75+ years from Prior Week': 'numconfrsvnewadmadult75pluspctchg',
- 'Percent Change in the Total Adult RSV Admissions from Prior Week': 'totalconfrsvnewadmadultpctchg',
- 'Percent Change in the Total RSV Admissions from Prior Week': 'totalconfrsvnewadmpctchg',
- 'Number Hospitals Reporting Percent Adult Inpatient Beds Occupied': 'pctinptbedsoccadulthosprep',
- 'Number Hospitals Reporting Percent Pediatric Inpatient Beds Occupied': 'pctinptbedsoccpedhosprep',
- 'Number Hospitals Reporting Percent Adult ICU Beds Occupied': 'pcticubedsoccadulthosprep',
- 'Number Hospitals Reporting Percent Pediatric ICU Beds Occupied': 'pcticubedsoccpedhosprep',
- 'Number Hospitals Reporting Percent Adult Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbedsadulthosprep',
- 'Number Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbedspedhosprep',
- 'Number Hospitals Reporting Percent Adult ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubedsadulthosprep',
- 'Number Hospitals Reporting Percent Pediatric ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubedspedhosprep',
- 'Number Hospitals Reporting Percent Adult Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbedsadulthosprep',
- 'Number Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbedspedhosprep',
- 'Number Hospitals Reporting Percent Adult ICU Beds Occupied by Influenza Patients': 'pctconffluicubedsadulthosprep',
- 'Number Hospitals Reporting Percent Pediatric ICU Beds Occupied by Influenza Patients': 'pctconffluicubedspedhosprep',
- 'Number Hospitals Reporting Percent Adult Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbedsadulthosprep',
- 'Number Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbedspedhosprep',
- 'Number Hospitals Reporting Percent Adult ICU Beds Occupied by RSV Patients': 'pctconfrsvicubedsadulthosprep',
- 'Number Hospitals Reporting Percent Pediatric ICU Beds Occupied by RSV Patients': 'pctconfrsvicubedspedhosprep',
- 'Number Hospitals Reporting Percent Hospitalized Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicuhosprep',
- 'Number Hospitals Reporting Percent Hospitalized Adult Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicuadulthosprep',
- 'Number Hospitals Reporting Percent Hospitalized Pediatric Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicupedhosprep',
- 'Number Hospitals Reporting Percent Hospitalized Patients with Influenza in the ICU': 'pctconffluhosppatsicuhosprep',
- 'Number Hospitals Reporting Percent Hospitalized Adult Patients with Influenza in the ICU': 'pctconffluhosppatsicuadulthosprep',
- 'Number Hospitals Reporting Percent Hospitalized Pediatric Patients with Influenza in the ICU': 'pctconffluhosppatsicupedhosprep',
- 'Number Hospitals Reporting Percent Hospitalized Patients with RSV in the ICU': 'pctconfrsvhosppatsicuhosprep',
- 'Number Hospitals Reporting Percent Hospitalized Adult Patients with RSV in the ICU': 'pctconfrsvhosppatsicuadulthosprep',
- 'Number Hospitals Reporting Percent Hospitalized Pediatric Patients with RSV in the ICU': 'pctconfrsvhosppatsicupedhosprep',
- 'Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied': 'pctinptbedsoccadultperchosprep',
- 'Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied': 'pctinptbedsoccpedperchosprep',
- 'Percent Hospitals Reporting Percent Adult ICU Beds Occupied': 'pcticubedsoccadultperchosprep',
- 'Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied': 'pcticubedsoccpedperchosprep',
- 'Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbedsadultperchosprep',
- 'Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by COVID-19 Patients': 'pctconfc19inptbedspedperchosprep',
- 'Percent Hospitals Reporting Percent Adult ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubedsadultperchosprep',
- 'Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by COVID-19 Patients': 'pctconfc19icubedspedperchosprep',
- 'Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbedsadultperchosprep',
- 'Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by Influenza Patients': 'pctconffluinptbedspedperchosprep',
- 'Percent Hospitals Reporting Percent Adult ICU Beds Occupied by Influenza Patients': 'pctconffluicubedsadultperchosprep',
- 'Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by Influenza Patients': 'pctconffluicubedspedperchosprep',
- 'Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbedsadultperchosprep',
- 'Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by RSV Patients': 'pctconfrsvinptbedspedperchosprep',
- 'Percent Hospitals Reporting Percent Adult ICU Beds Occupied by RSV Patients': 'pctconfrsvicubedsadultperchosprep',
- 'Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by RSV Patients': 'pctconfrsvicubedspedperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicuperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Adult Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicuadultperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with COVID-19 in the ICU': 'pctconfc19hosppatsicupedperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Patients with Influenza in the ICU': 'pctconffluhosppatsicuperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Adult Patients with Influenza in the ICU': 'pctconffluhosppatsicuadultperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with Influenza in the ICU': 'pctconffluhosppatsicupedperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Patients with RSV in the ICU': 'pctconfrsvhosppatsicuperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Adult Patients with RSV in the ICU': 'pctconfrsvhosppatsicuadultperchosprep',
- 'Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with RSV in the ICU': 'pctconfrsvhosppatsicupedperchosprep',
- 'Absolute Change in the Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied from Prior Week': 'pctinptbedsoccadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied from Prior Week': 'pctinptbedsoccpedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Adult ICU Beds Occupied from Prior Week': 'pcticubedsoccadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied from Prior Week': 'pcticubedsoccpedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by COVID-19 Patients from Prior Week': 'pctconfc19inptbedsadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by COVID-19 Patients from Prior Week': 'pctconfc19inptbedspedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Adult ICU Beds Occupied by COVID-19 Patients from Prior Week': 'pctconfc19icubedsadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by COVID-19 Patients from Prior Week': 'pctconfc19icubedspedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by Influenza Patients from Prior Week': 'pctconffluinptbedsadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by Influenza Patients from Prior Week': 'pctconffluinptbedspedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Adult ICU Beds Occupied by Influenza Patients from Prior Week': 'pctconffluicubedsadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by Influenza Patients from Prior Week': 'pctconffluicubedspedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by RSV Patients from Prior Week': 'pctconfrsvinptbedsadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by RSV Patients from Prior Week': 'pctconfrsvinptbedspedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Adult ICU Beds Occupied by RSV Patients from Prior Week': 'pctconfrsvicubedsadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by RSV Patients from Prior Week': 'pctconfrsvicubedspedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Patients with COVID-19 in the ICU from Prior Week': 'pctconfc19hosppatsicuperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Adult Patients with COVID-19 in the ICU from Prior Week': 'pctconfc19hosppatsicuadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with COVID-19 in the ICU from Prior Week': 'pctconfc19hosppatsicupedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Patients with Influenza in the ICU from Prior Week': 'pctconffluhosppatsicuperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Adult Patients with Influenza in the ICU from Prior Week': 'pctconffluhosppatsicuadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with Influenza in the ICU from Prior Week': 'pctconffluhosppatsicupedperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Patients with RSV in the ICU from Prior Week': 'pctconfrsvhosppatsicuperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Adult Patients with RSV in the ICU from Prior Week': 'pctconfrsvhosppatsicuadultperchosprepabschg',
- 'Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with RSV in the ICU from Prior Week': 'pctconfrsvhosppatsicupedperchosprepabschg'
-}
+ "Week Ending Date": "weekendingdate",
+ "Geographic aggregation": "jurisdiction",
+ "Number of Inpatient Beds": "numinptbeds",
+ "Number of Adult Inpatient Beds": "numinptbedsadult",
+ "Number of Pediatric Inpatient beds": "numinptbedsped",
+ "Number of Inpatient Beds Occupied": "numinptbedsocc",
+ "Number of Adult Inpatient Beds Occupied": "numinptbedsoccadult",
+ "Number of Pediatric Inpatient Beds Occupied": "numinptbedsoccped",
+ "Number of ICU Beds": "numicubeds",
+ "Number of Adult ICU Beds": "numicubedsadult",
+ "Number of Pediatric ICU Beds": "numicubedsped",
+ "Number of ICU Beds Occupied": "numicubedsocc",
+ "Number of Adult ICU Beds Occupied": "numicubedsoccadult",
+ "Number of Pediatric ICU Beds Occupied": "numicubedsoccped",
+ "Number of Adult Patients Hospitalized with COVID-19":
+ "numconfc19hosppatsadult",
+ "Number of Pediatric Patients Hospitalized with COVID-19":
+ "numconfc19hosppatsped",
+ "Total Patients Hospitalized with COVID-19": "totalconfc19hosppats",
+ "Number of Adult Patients Hospitalized with Influenza":
+ "numconffluhosppatsadult",
+ "Number of Pedatric Patients Hospitalized with Influenza":
+ "numconffluhosppatsped",
+ "Total Patients Hospitalized with Influenza": "totalconffluhosppats",
+ "Number of Adult Patients Hospitalized with RSV": "numconfrsvhosppatsadult",
+ "Number of Pediatric Patients Hospitalized with RSV": "numconfrsvhosppatsped",
+ "Total Patients Hospitalized with RSV": "totalconfrsvhosppats",
+ "Number of Adult ICU Patients Hospitalized with COVID-19":
+ "numconfc19icupatsadult",
+ "Number of Pediatric ICU Patients Hospitalized with COVID-19":
+ "numconfc19icupatsped",
+ "Total ICU Patients Hospitalized with COVID-19 ": "totalconfc19icupats",
+ "Number of Adult ICU Patients Hospitalized with Influenza":
+ "numconffluicupatsadult",
+ "Number of Pediatric ICU Patients Hospitalized with Influenza":
+ "numconffluicupatsped",
+ "Total ICU Patients Hospitalized with Influenza": "totalconffluicupats",
+ "Number of Adult ICU Patients Hospitalized with RSV":
+ "numconfrsvicupatsadult",
+ "Number of Pediatric ICU Patients Hospitalized with RSV":
+ "numconfrsvicupatsped",
+ "Total ICU Patients Hospitalized with RSV": "totalconfrsvicupats",
+ "Number of Pediatric COVID-19 Admissions, 0-4 years":
+ "numconfc19newadmped0to4",
+ "Number of Pediatric COVID-19 Admissions, 5-17 years":
+ "numconfc19newadmped5to17",
+ "Total Pediatric COVID-19 Admissions": "totalconfc19newadmped",
+ "Number of Adult COVID-19 Admissions, 18-49 years":
+ "numconfc19newadmadult18to49",
+ "Number of Adult COVID-19 Admissions, 50-64 years":
+ "numconfc19newadmadult50to64",
+ "Number of Adult COVID-19 Admissions, 65-74 years":
+ "numconfc19newadmadult65to74",
+ "Number of Adult COVID-19 Admissions, 75+ years":
+ "numconfc19newadmadult75plus",
+ "Total Adult COVID-19 Admissions": "totalconfc19newadmadult",
+ "Number of COVID-19 Admissions, unknown age": "numconfc19newadmunk",
+ "Total COVID-19 Admissions": "totalconfc19newadm",
+ "Number of Pediatric Influenza Admissions, 0-4 years":
+ "numconfflunewadmped0to4",
+ "Number of Pediatric Influenza Admissions, 5-17 years":
+ "numconfflunewadmped5to17",
+ "Total Pediatric Influenza Admissions": "totalconfflunewadmped",
+ "Number of Adult Influenza Admissions, 18-49 years":
+ "numconfflunewadmadult18to49",
+ "Number of Adult Influenza Admissions, 50-64 years":
+ "numconfflunewadmadult50to64",
+ "Number of Adult Influenza Admissions, 65-74 years":
+ "numconfflunewadmadult65to74",
+ "Number of Adult Influenza Admissions, 75+ years":
+ "numconfflunewadmadult75plus",
+ "Total Adult Influenza Admissions": "totalconfflunewadmadult",
+ "Number of Influenza Admissions, unknown age": "numconfflunewadmunk",
+ "Total Influenza Admissions": "totalconfflunewadm",
+ "Number of Pediatric RSV Admissions, 0-4 years": "numconfrsvnewadmped0to4",
+ "Number of Pediatric RSV Admissions, 5-17 years": "numconfrsvnewadmped5to17",
+ "Total Pediatric RSV Admissions": "totalconfrsvnewadmped",
+ "Number of Adult RSV Admissions, 18-49 years": "numconfrsvnewadmadult18to49",
+ "Number of Adult RSV Admissions, 50-64 years": "numconfrsvnewadmadult50to64",
+ "Number of Adult RSV Admissions, 65-74 years": "numconfrsvnewadmadult65to74",
+ "Number of Adult RSV Admissions, 75+ years": "numconfrsvnewadmadult75plus",
+ "Total Adult RSV Admissions": "totalconfrsvnewadmadult",
+ "Number of RSV Admissions, unknown age": "numconfrsvnewadmunk",
+ "Total RSV Admissions": "totalconfrsvnewadm",
+ "Percent Inpatient Beds Occupied": "pctinptbedsocc",
+ "Percent Inpatient Beds Occupied by COVID-19 Patients": "pctconfc19inptbeds",
+ "Percent Inpatient Beds Occupied by Influenza Patients": "pctconffluinptbeds",
+ "Percent Inpatient Beds Occupied by RSV Patients": "pctconfrsvinptbeds",
+ "Percent ICU Beds Occupied": "pcticubedsocc",
+ "Percent ICU Beds Occupied by COVID-19 Patients": "pctconfc19icubeds",
+ "Percent ICU Beds Occupied by Influenza Patients": "pctconffluicubeds",
+ "Percent ICU Beds Occupied by RSV Patients": "pctconfrsvicubeds",
+ "Percent Adult COVID-19 Admissions": "pctconfc19newadmadult",
+ "Percent Pediatric COVID-19 Admissions": "pctconfc19newadmped",
+ "Percent Adult Influenza Admissions": "pctconfflunewadmadult",
+ "Percent Pediatric Influenza Admissions": "pctconfflunewadmped",
+ "Percent Adult RSV Admissions": "pctconfrsvnewadmadult",
+ "Percent Pediatric RSV Admissions": "pctconfrsvnewadmped",
+ "Number Hospitals Reporting Number of Inpatient Beds": "numinptbedshosprep",
+ "Number Hospitals Reporting Number of Inpatient Beds Occupied":
+ "numinptbedsocchosprep",
+ "Number Hospitals Reporting Number of ICU Beds ": "numicubedshosprep",
+ "Number Hospitals Reporting Number of ICU Beds Occupied":
+ "numicubedsocchosprep",
+ "Number Hospitals Reporting Total Patients Hospitalized with COVID-19":
+ "totalconfc19hosppatshosprep",
+ "Number Hospitals Reporting TotalPatients Hospitalized with Influenza":
+ "totalconffluhosppatshosprep",
+ "Number Hospitals Reporting Total Patients Hospitalized with RSV":
+ "totalconfrsvhosppatshosprep",
+ "Number Hospitals Reporting ICU Patients Hospitalized with COVID-19 ":
+ "totalconfc19icupatshosprep",
+ "Number Hospitals Reporting ICU Patients Hospitalized with Influenza":
+ "totalconffluicupatshosprep",
+ "Number Hospitals Reporting ICU Patients Hospitalized with RSV":
+ "totalconfrsvicupatshosprep",
+ "Number Hospitals Reporting Pediatric COVID-19 Admissions":
+ "totalconfc19newadmpedhosprep",
+ "Number Hospitals Reporting Adult COVID-19 Admissions":
+ "totalconfc19newadmadulthosprep",
+ "Number Hospitals Reporting COVID-19 Admissions": "totalconfc19newadmhosprep",
+ "Number Hospitals Reporting Pediatric Influenza Admissions":
+ "totalconfflunewadmpedhosprep",
+ "Number Hospitals Reporting Adult Influenza Admissions":
+ "totalconfflunewadmadulthosprep",
+ "Number Hospitals Reporting Influenza Admissions":
+ "totalconfflunewadmhosprep",
+ "Number Hospitals Reporting Pediatric RSV Admissions":
+ "totalconfrsvnewadmpedhosprep",
+ "Number Hospitals Reporting Adult RSV Admissions":
+ "totalconfrsvnewadmadulthosprep",
+ "Number Hospitals Reporting RSV Admissions": "totalconfrsvnewadmhosprep",
+ "Number Hospitals Reporting Percent Inpatient Beds Occupied":
+ "pctinptbedsocchosprep",
+ "Number Hospitals Reporting Percent ICU Beds Occupied":
+ "pcticubedsocchosprep",
+ "Number Hospitals Reporting Percent Inpatient Beds Occupied by COVID-19 Patients":
+ "pctconfc19inptbedshosprep",
+ "Number Hospitals Reporting Percent Inpatient Beds Occupied by Influenza Patients":
+ "pctconffluinptbedshosprep",
+ "Number Hospitals Reporting Percent Inpatient Beds Occupied by RSV Patients":
+ "pctconfrsvinptbedshosprep",
+ "Number Hospitals Reporting Percent ICU Beds Occupied by COVID-19 Patients":
+ "pctconfc19icubedshosprep",
+ "Number Hospitals Reporting Percent ICU Beds Occupied by Influenza Patients":
+ "pctconffluicubedshosprep",
+ "Number Hospitals Reporting Percent ICU Beds Occupied by RSV Patients":
+ "pctconfrsvicubedshosprep",
+ "Percent Hospitals Reporting Number of Inpatient Beds":
+ "numinptbedsperchosprep",
+ "Percent Hospitals Reporting Number of Inpatient Beds Occupied":
+ "numinptbedsoccperchosprep",
+ "Percent Hospitals Reporting Number of ICU Beds ": "numicubedsperchosprep",
+ "Percent Hospitals Reporting Number of ICU Beds Occupied":
+ "numicubedsoccperchosprep",
+ "Percent Hospitals Reporting Total Patients Hospitalized with COVID-19":
+ "totalconfc19hosppatsperc",
+ "Percent Hospitals Reporting TotalPatients Hospitalized with Influenza":
+ "totalconffluhosppatsperc",
+ "Percent Hospitals Reporting Total Patients Hospitalized with RSV":
+ "totalconfrsvhosppatsperc",
+ "Percent Hospitals Reporting ICU Patients Hospitalized with COVID-19 ":
+ "totalconfc19icupatsperchosprep",
+ "Percent Hospitals Reporting ICU Patients Hospitalized with Influenza":
+ "totalconffluicupatsperchosprep",
+ "Percent Hospitals Reporting ICU Patients Hospitalized with RSV":
+ "totalconfrsvicupatsperchosprep",
+ "Percent Hospitals Reporting Pediatric COVID-19 Admissions":
+ "totalconfc19newadmpedper",
+ "Percent Hospitals Reporting Adult COVID-19 Admissions":
+ "totalconfc19newadmadultp",
+ "Percent Hospitals Reporting COVID-19 Admissions":
+ "totalconfc19newadmperchosprep",
+ "Percent Hospitals Reporting Pediatric Influenza Admissions":
+ "totalconfflunewadmpedper",
+ "Percent Hospitals Reporting Adult Influenza Admissions":
+ "totalconfflunewadmadultp",
+ "Percent Hospitals Reporting Influenza Admissions":
+ "totalconfflunewadmperchosprep",
+ "Percent Hospitals Reporting Pediatric RSV Admissions":
+ "totalconfrsvnewadmpedper",
+ "Percent Hospitals Reporting Adult RSV Admissions":
+ "totalconfrsvnewadmadultp",
+ "Percent Hospitals Reporting RSV Admissions": "totalconfrsvnewadmperchosprep",
+ "Percent Hospitals Reporting Percent Inpatient Beds Occupied":
+ "pctinptbedsoccperchosprep",
+ "Percent Hospitals Reporting Percent ICU Beds Occupied":
+ "pcticubedsoccperchosprep",
+ "Percent Hospitals Reporting Percent Inpatient Beds Occupied by COVID-19 Patients":
+ "pctconfc19inptbedsperchosprep",
+ "Percent Hospitals Reporting Percent Inpatient Beds Occupied by Influenza Patients":
+ "pctconffluinptbedsperchosprep",
+ "Percent Hospitals Reporting Percent Inpatient Beds Occupied by RSV Patients":
+ "pctconfrsvinptbedsperchosprep",
+ "Percent Hospitals Reporting Percent ICU Beds Occupied by COVID-19 Patients":
+ "pctconfc19icubedsperchosprep",
+ "Percent Hospitals Reporting Percent ICU Beds Occupied by Influenza Patients":
+ "pctconffluicubedsperchosprep",
+ "Percent Hospitals Reporting Percent ICU Beds Occupied by RSV Patients":
+ "pctconfrsvicubedsperchosprep",
+ "Absolute Change in the Percent Hospitals Reporting Number of Inpatient Beds from Prior Week":
+ "numinptbedsperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Number of Inpatient Beds Occupied from Prior Week":
+ "numinptbedsoccperchospre",
+ "Absolute Change in the Percent Hospitals Reporting Number of ICU Beds from Prior Week":
+ "numicubedsperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Number of ICU Beds Occupied from Prior Week":
+ "numicubedsoccperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Total Patients Hospitalized with COVID-19 from Prior Week":
+ "totalconfc19hosppatsperc_1",
+ "Absolute Change in the Percent Hospitals Reporting TotalPatients Hospitalized with Influenza from Prior Week":
+ "totalconffluhosppatsperc_1",
+ "Absolute Change in the Percent Hospitals Reporting Total Patients Hospitalized with RSV from Prior Week":
+ "totalconfrsvhosppatsperc_1",
+ "Absolute Change in the Percent Hospitals Reporting ICU Patients Hospitalized with COVID-19 from Prior Week":
+ "totalconfc19icupatsperch",
+ "Absolute Change in the Percent Hospitals Reporting ICU Patients Hospitalized with Influenza from Prior Week":
+ "totalconffluicupatsperch",
+ "Absolute Change in the Percent Hospitals Reporting ICU Patients Hospitalized with RSV from Prior Week":
+ "totalconfrsvicupatsperch",
+ "Absolute Change in the Percent Hospitals Reporting Pediatric COVID-19 Admissions from Prior Week":
+ "totalconfc19newadmpedper_1",
+ "Absolute Change in the Percent Hospitals Reporting Adult COVID-19 Admissions from Prior Week":
+ "totalconfc19newadmadultp_1",
+ "Absolute Change in the Percent Hospitals Reporting COVID-19 Admissions from Prior Week":
+ "totalconfc19newadmpercho",
+ "Absolute Change in the Percent Hospitals Reporting Pediatric Influenza Admissions from Prior Week":
+ "totalconfflunewadmpedper_1",
+ "Absolute Change in the Percent Hospitals Reporting Adult Influenza Admissions from Prior Week":
+ "totalconfflunewadmadultp_1",
+ "Absolute Change in the Percent Hospitals Reporting Influenza Admissions from Prior Week":
+ "totalconfflunewadmpercho",
+ "Absolute Change in the Percent Hospitals Reporting Pediatric RSV Admissions from Prior Week":
+ "totalconfrsvnewadmpedper_1",
+ "Absolute Change in the Percent Hospitals Reporting Adult RSV Admissions from Prior Week":
+ "totalconfrsvnewadmadultp_1",
+ "Absolute Change in the Percent Hospitals Reporting RSV Admissions from Prior Week":
+ "totalconfrsvnewadmpercho",
+ "Absolute Change in the Percent Hospitals Reporting Percent Inpatient Beds Occupied from Prior Week":
+ "pctinptbedsoccperchospre",
+ "Absolute Change in the Percent Hospitals Reporting Percent ICU Beds Occupied from Prior Week":
+ "pcticubedsoccperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Inpatient Beds Occupied by COVID-19 Patients from Prior Week":
+ "pctconfc19inptbedspercho",
+ "Absolute Change in the Percent Hospitals Reporting Percent Inpatient Beds Occupied by Influenza Patients from Prior Week":
+ "pctconffluinptbedspercho",
+ "Absolute Change in the Percent Hospitals Reporting Percent Inpatient Beds Occupied by RSV Patients from Prior Week":
+ "pctconfrsvinptbedspercho",
+ "Absolute Change in the Percent Hospitals Reporting Percent ICU Beds Occupied by COVID-19 Patients from Prior Week":
+ "pctconfc19icubedsperchos",
+ "Absolute Change in the Percent Hospitals Reporting Percent ICU Beds Occupied by Influenza Patients from Prior Week":
+ "pctconffluicubedsperchos",
+ "Absolute Change in the Percent Hospitals Reporting Percent ICU Beds Occupied by RSV Patients from Prior Week":
+ "pctconfrsvicubedsperchos",
+ "Number of Pediatric COVID-19 Admissions, 0-4 years, per 100,000 population":
+ "numconfc19newadmped0to4per100k",
+ "Number of Pediatric COVID-19 Admissions, 5-17 years, per 100,000 population":
+ "numconfc19newadmped5to17per100k",
+ "Total Number of Pediatric COVID-19 Admissions per 100,000 population":
+ "totalconfc19newadmpedper100k",
+ "Number of Adult COVID-19 Admissions, 18-49 years, per 100,000 population":
+ "numconfc19newadmadult18to49per100k",
+ "Number of Adult COVID-19 Admissions, 50-64 years, per 100,000 population":
+ "numconfc19newadmadult50to64per100k",
+ "Number of Adult COVID-19 Admissions, 65-74 years, per 100,000 population":
+ "numconfc19newadmadult65to74per100k",
+ "Number of Adult COVID-19 Admissions, 75+ years, per 100,000 population":
+ "numconfc19newadmadult75plusper100k",
+ "Total Number of Adult COVID-19 Admissions per 100,000 population":
+ "totalconfc19newadmadultper100k",
+ "Total number of COVID-19 Admissions per 100,000 population":
+ "totalconfc19newadmper100k",
+ "Number of Pediatric Influenza Admissions, 0-4 years, per 100,000 population":
+ "numconfflunewadmped0to4per100k",
+ "Number of Pediatric Influenza Admissions, 5-17 years, per 100,000 population":
+ "numconfflunewadmped5to17per100k",
+ "Total Number of Pediatric Influenza Admissions per 100,000 population":
+ "totalconfflunewadmpedper100k",
+ "Number of Adult Influenza Admissions, 18-49 years, per 100,000 population":
+ "numconfflunewadmadult18to49per100k",
+ "Number of Adult Influenza Admissions, 50-64 years, per 100,000 population":
+ "numconfflunewadmadult50to64per100k",
+ "Number of Adult Influenza Admissions, 65-74 years, per 100,000 population":
+ "numconfflunewadmadult65to74per100k",
+ "Number of Adult Influenza Admissions, 75+ years, per 100,000 population":
+ "numconfflunewadmadult75plusper100k",
+ "Total Number of Adult Influenza Admissions per 100,000 population":
+ "totalconfflunewadmadultper100k",
+ "Total number of Influenza Admissions per 100,000 population":
+ "totalconfflunewadmper100k",
+ "Number of Pediatric RSV Admissions, 0-4 years, per 100,000 population":
+ "numconfrsvnewadmped0to4per100k",
+ "Number of Pediatric RSV Admissions, 5-17 years, per 100,000 population":
+ "numconfrsvnewadmped5to17per100k",
+ "Total Number of Pediatric RSV Admissions per 100,000 population":
+ "totalconfrsvnewadmpedper100k",
+ "Number of Adult RSV Admissions, 18-49 years, per 100,000 population":
+ "numconfrsvnewadmadult18to49per100k",
+ "Number of Adult RSV Admissions, 50-64 years, per 100,000 population":
+ "numconfrsvnewadmadult50to64per100k",
+ "Number of Adult RSV Admissions, 65-74 years, per 100,000 population":
+ "numconfrsvnewadmadult65to74per100k",
+ "Number of Adult RSV Admissions, 75+ years, per 100,000 population":
+ "numconfrsvnewadmadult75plusper100k",
+ "Total Number of Adult RSV Admissions per 100,000 population":
+ "totalconfrsvnewadmadultper100k",
+ "Total number of RSV Admissions per 100,000 population":
+ "totalconfrsvnewadmper100k",
+ "Percent Hospitals Reporting Total New COVID-19 Admissions Above 80%":
+ "totalconfc19newadmperchosprepabove80pct",
+ "Percent Hospitals Reporting Total New COVID-19 Admissions Above 90%":
+ "totalconfc19newadmperchosprepabove90pct",
+ "Percent Hospitals Reporting Total New Influenza Admissions Above 80%":
+ "totalconfflunewadmperchosprepabove80pct",
+ "Percent Hospitals Reporting Total New Influenza Admissions Above 90%":
+ "totalconfflunewadmperchosprepabove90pct",
+ "Percent Hospitals Reporting Total New RSV Admissions Above 80%":
+ "totalconfrsvnewadmperchosprepabove80pct",
+ "Percent Hospitals Reporting Total New RSV Admissions Above 90%":
+ "totalconfrsvnewadmperchosprepabove90pct",
+ "Percent Adult Inpatient Beds Occupied": "pctinptbedsoccadult",
+ "Percent Pediatric Inpatient Beds Occupied": "pctinptbedsoccped",
+ "Percent Adult ICU Beds Occupied": "pcticubedsoccadult",
+ "Percent Pediatric ICU Beds Occupied": "pcticubedsoccped",
+ "Percent Adult Inpatient Beds Occupied by COVID-19 Patients":
+ "pctconfc19inptbedsadult",
+ "Percent Pediatric Inpatient Beds Occupied by COVID-19 Patients":
+ "pctconfc19inptbedsped",
+ "Percent Adult ICU Beds Occupied by COVID-19 Patients":
+ "pctconfc19icubedsadult",
+ "Percent Pediatric ICU Beds Occupied by COVID-19 Patients":
+ "pctconfc19icubedsped",
+ "Percent Adult Inpatient Beds Occupied by Influenza Patients":
+ "pctconffluinptbedsadult",
+ "Percent Pediatric Inpatient Beds Occupied by Influenza Patients":
+ "pctconffluinptbedsped",
+ "Percent Adult ICU Beds Occupied by Influenza Patients":
+ "pctconffluicubedsadult",
+ "Percent Pediatric ICU Beds Occupied by Influenza Patients":
+ "pctconffluicubedsped",
+ "Percent Adult Inpatient Beds Occupied by RSV Patients":
+ "pctconfrsvinptbedsadult",
+ "Percent Pediatric Inpatient Beds Occupied by RSV Patients":
+ "pctconfrsvinptbedsped",
+ "Percent Adult ICU Beds Occupied by RSV Patients": "pctconfrsvicubedsadult",
+ "Percent Pediatric ICU Beds Occupied by RSV Patients": "pctconfrsvicubedsped",
+ "Percent Hospitalized Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicu",
+ "Percent Hospitalized Adult Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicuadult",
+ "Percent Hospitalized Pediatric Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicuped",
+ "Percent Hospitalized Patients with Influenza in the ICU":
+ "pctconffluhosppatsicu",
+ "Percent Hospitalized Adult Patients with Influenza in the ICU":
+ "pctconffluhosppatsicuadult",
+ "Percent Hospitalized Pediatric Patients with Influenza in the ICU":
+ "pctconffluhosppatsicuped",
+ "Percent Hospitalized Patients with RSV in the ICU": "pctconfrsvhosppatsicu",
+ "Percent Hospitalized Adult Patients with RSV in the ICU":
+ "pctconfrsvhosppatsicuadult",
+ "Percent Hospitalized Pediatric Patients with RSV in the ICU":
+ "pctconfrsvhosppatsicuped",
+ "Percent Change in the Number of Pediatric COVID-19 Admissions, 0-4 years from Prior Week":
+ "numconfc19newadmped0to4pctchg",
+ "Percent Change in the Number of Pediatric COVID-19 Admissions, 5-17 years from Prior Week":
+ "numconfc19newadmped5to17pctchg",
+ "Percent Change in the Total Pediatric COVID-19 Admissions from Prior Week":
+ "totalconfc19newadmpedpctchg",
+ "Percent Change in the Number of Adult COVID-19 Admissions, 18-49 years from Prior Week":
+ "numconfc19newadmadult18to49pctchg",
+ "Percent Change in the Number of Adult COVID-19 Admissions, 50-64 years from Prior Week":
+ "numconfc19newadmadult50to64pctchg",
+ "Percent Change in the Number of Adult COVID-19 Admissions, 65-74 years from Prior Week":
+ "numconfc19newadmadult65to74pctchg",
+ "Percent Change in the Number of Adult COVID-19 Admissions, 75+ years from Prior Week":
+ "numconfc19newadmadult75pluspctchg",
+ "Percent Change in the Total Adult COVID-19 Admissions from Prior Week":
+ "totalconfc19newadmadultpctchg",
+ "Percent Change in the Total COVID-19 Admissions from Prior Week":
+ "totalconfc19newadmpctchg",
+ "Percent Change in the Number of Pediatric Influenza Admissions, 0-4 years from Prior Week":
+ "numconfflunewadmped0to4pctchg",
+ "Percent Change in the Number of Pediatric Influenza Admissions, 5-17 years from Prior Week":
+ "numconfflunewadmped5to17pctchg",
+ "Percent Change in the Total Pediatric Influenza Admissions from Prior Week":
+ "totalconfflunewadmpedpctchg",
+ "Percent Change in the Number of Adult Influenza Admissions, 18-49 years from Prior Week":
+ "numconfflunewadmadult18to49pctchg",
+ "Percent Change in the Number of Adult Influenza Admissions, 50-64 years from Prior Week":
+ "numconfflunewadmadult50to64pctchg",
+ "Percent Change in the Number of Adult Influenza Admissions, 65-74 years from Prior Week":
+ "numconfflunewadmadult65to74pctchg",
+ "Percent Change in the Number of Adult Influenza Admissions, 75+ years from Prior Week":
+ "numconfflunewadmadult75pluspctchg",
+ "Percent Change in the Total Adult Influenza Admissions from Prior Week":
+ "totalconfflunewadmadultpctchg",
+ "Percent Change in the Total Influenza Admissions from Prior Week":
+ "totalconfflunewadmpctchg",
+ "Percent Change in the Number of Pediatric RSV Admissions, 0-4 years from Prior Week":
+ "numconfrsvnewadmped0to4pctchg",
+ "Percent Change in the Number of Pediatric RSV Admissions, 5-17 years from Prior Week":
+ "numconfrsvnewadmped5to17pctchg",
+ "Percent Change in the Total Pediatric RSV Admissions from Prior Week":
+ "totalconfrsvnewadmpedpctchg",
+ "Percent Change in the Number of Adult RSV Admissions, 18-49 years from Prior Week":
+ "numconfrsvnewadmadult18to49pctchg",
+ "Percent Change in the Number of Adult RSV Admissions, 50-64 years from Prior Week":
+ "numconfrsvnewadmadult50to64pctchg",
+ "Percent Change in the Number of Adult RSV Admissions, 65-74 years from Prior Week":
+ "numconfrsvnewadmadult65to74pctchg",
+ "Percent Change in the Number of Adult RSV Admissions, 75+ years from Prior Week":
+ "numconfrsvnewadmadult75pluspctchg",
+ "Percent Change in the Total Adult RSV Admissions from Prior Week":
+ "totalconfrsvnewadmadultpctchg",
+ "Percent Change in the Total RSV Admissions from Prior Week":
+ "totalconfrsvnewadmpctchg",
+ "Number Hospitals Reporting Percent Adult Inpatient Beds Occupied":
+ "pctinptbedsoccadulthosprep",
+ "Number Hospitals Reporting Percent Pediatric Inpatient Beds Occupied":
+ "pctinptbedsoccpedhosprep",
+ "Number Hospitals Reporting Percent Adult ICU Beds Occupied":
+ "pcticubedsoccadulthosprep",
+ "Number Hospitals Reporting Percent Pediatric ICU Beds Occupied":
+ "pcticubedsoccpedhosprep",
+ "Number Hospitals Reporting Percent Adult Inpatient Beds Occupied by COVID-19 Patients":
+ "pctconfc19inptbedsadulthosprep",
+ "Number Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by COVID-19 Patients":
+ "pctconfc19inptbedspedhosprep",
+ "Number Hospitals Reporting Percent Adult ICU Beds Occupied by COVID-19 Patients":
+ "pctconfc19icubedsadulthosprep",
+ "Number Hospitals Reporting Percent Pediatric ICU Beds Occupied by COVID-19 Patients":
+ "pctconfc19icubedspedhosprep",
+ "Number Hospitals Reporting Percent Adult Inpatient Beds Occupied by Influenza Patients":
+ "pctconffluinptbedsadulthosprep",
+ "Number Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by Influenza Patients":
+ "pctconffluinptbedspedhosprep",
+ "Number Hospitals Reporting Percent Adult ICU Beds Occupied by Influenza Patients":
+ "pctconffluicubedsadulthosprep",
+ "Number Hospitals Reporting Percent Pediatric ICU Beds Occupied by Influenza Patients":
+ "pctconffluicubedspedhosprep",
+ "Number Hospitals Reporting Percent Adult Inpatient Beds Occupied by RSV Patients":
+ "pctconfrsvinptbedsadulthosprep",
+ "Number Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by RSV Patients":
+ "pctconfrsvinptbedspedhosprep",
+ "Number Hospitals Reporting Percent Adult ICU Beds Occupied by RSV Patients":
+ "pctconfrsvicubedsadulthosprep",
+ "Number Hospitals Reporting Percent Pediatric ICU Beds Occupied by RSV Patients":
+ "pctconfrsvicubedspedhosprep",
+ "Number Hospitals Reporting Percent Hospitalized Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicuhosprep",
+ "Number Hospitals Reporting Percent Hospitalized Adult Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicuadulthosprep",
+ "Number Hospitals Reporting Percent Hospitalized Pediatric Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicupedhosprep",
+ "Number Hospitals Reporting Percent Hospitalized Patients with Influenza in the ICU":
+ "pctconffluhosppatsicuhosprep",
+ "Number Hospitals Reporting Percent Hospitalized Adult Patients with Influenza in the ICU":
+ "pctconffluhosppatsicuadulthosprep",
+ "Number Hospitals Reporting Percent Hospitalized Pediatric Patients with Influenza in the ICU":
+ "pctconffluhosppatsicupedhosprep",
+ "Number Hospitals Reporting Percent Hospitalized Patients with RSV in the ICU":
+ "pctconfrsvhosppatsicuhosprep",
+ "Number Hospitals Reporting Percent Hospitalized Adult Patients with RSV in the ICU":
+ "pctconfrsvhosppatsicuadulthosprep",
+ "Number Hospitals Reporting Percent Hospitalized Pediatric Patients with RSV in the ICU":
+ "pctconfrsvhosppatsicupedhosprep",
+ "Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied":
+ "pctinptbedsoccadultperchosprep",
+ "Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied":
+ "pctinptbedsoccpedperchosprep",
+ "Percent Hospitals Reporting Percent Adult ICU Beds Occupied":
+ "pcticubedsoccadultperchosprep",
+ "Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied":
+ "pcticubedsoccpedperchosprep",
+ "Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by COVID-19 Patients":
+ "pctconfc19inptbedsadultperchosprep",
+ "Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by COVID-19 Patients":
+ "pctconfc19inptbedspedperchosprep",
+ "Percent Hospitals Reporting Percent Adult ICU Beds Occupied by COVID-19 Patients":
+ "pctconfc19icubedsadultperchosprep",
+ "Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by COVID-19 Patients":
+ "pctconfc19icubedspedperchosprep",
+ "Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by Influenza Patients":
+ "pctconffluinptbedsadultperchosprep",
+ "Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by Influenza Patients":
+ "pctconffluinptbedspedperchosprep",
+ "Percent Hospitals Reporting Percent Adult ICU Beds Occupied by Influenza Patients":
+ "pctconffluicubedsadultperchosprep",
+ "Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by Influenza Patients":
+ "pctconffluicubedspedperchosprep",
+ "Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by RSV Patients":
+ "pctconfrsvinptbedsadultperchosprep",
+ "Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by RSV Patients":
+ "pctconfrsvinptbedspedperchosprep",
+ "Percent Hospitals Reporting Percent Adult ICU Beds Occupied by RSV Patients":
+ "pctconfrsvicubedsadultperchosprep",
+ "Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by RSV Patients":
+ "pctconfrsvicubedspedperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicuperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Adult Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicuadultperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with COVID-19 in the ICU":
+ "pctconfc19hosppatsicupedperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Patients with Influenza in the ICU":
+ "pctconffluhosppatsicuperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Adult Patients with Influenza in the ICU":
+ "pctconffluhosppatsicuadultperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with Influenza in the ICU":
+ "pctconffluhosppatsicupedperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Patients with RSV in the ICU":
+ "pctconfrsvhosppatsicuperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Adult Patients with RSV in the ICU":
+ "pctconfrsvhosppatsicuadultperchosprep",
+ "Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with RSV in the ICU":
+ "pctconfrsvhosppatsicupedperchosprep",
+ "Absolute Change in the Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied from Prior Week":
+ "pctinptbedsoccadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied from Prior Week":
+ "pctinptbedsoccpedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Adult ICU Beds Occupied from Prior Week":
+ "pcticubedsoccadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied from Prior Week":
+ "pcticubedsoccpedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by COVID-19 Patients from Prior Week":
+ "pctconfc19inptbedsadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by COVID-19 Patients from Prior Week":
+ "pctconfc19inptbedspedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Adult ICU Beds Occupied by COVID-19 Patients from Prior Week":
+ "pctconfc19icubedsadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by COVID-19 Patients from Prior Week":
+ "pctconfc19icubedspedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by Influenza Patients from Prior Week":
+ "pctconffluinptbedsadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by Influenza Patients from Prior Week":
+ "pctconffluinptbedspedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Adult ICU Beds Occupied by Influenza Patients from Prior Week":
+ "pctconffluicubedsadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by Influenza Patients from Prior Week":
+ "pctconffluicubedspedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Adult Inpatient Beds Occupied by RSV Patients from Prior Week":
+ "pctconfrsvinptbedsadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Pediatric Inpatient Beds Occupied by RSV Patients from Prior Week":
+ "pctconfrsvinptbedspedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Adult ICU Beds Occupied by RSV Patients from Prior Week":
+ "pctconfrsvicubedsadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Pediatric ICU Beds Occupied by RSV Patients from Prior Week":
+ "pctconfrsvicubedspedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Patients with COVID-19 in the ICU from Prior Week":
+ "pctconfc19hosppatsicuperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Adult Patients with COVID-19 in the ICU from Prior Week":
+ "pctconfc19hosppatsicuadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with COVID-19 in the ICU from Prior Week":
+ "pctconfc19hosppatsicupedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Patients with Influenza in the ICU from Prior Week":
+ "pctconffluhosppatsicuperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Adult Patients with Influenza in the ICU from Prior Week":
+ "pctconffluhosppatsicuadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with Influenza in the ICU from Prior Week":
+ "pctconffluhosppatsicupedperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Patients with RSV in the ICU from Prior Week":
+ "pctconfrsvhosppatsicuperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Adult Patients with RSV in the ICU from Prior Week":
+ "pctconfrsvhosppatsicuadultperchosprepabschg",
+ "Absolute Change in the Percent Hospitals Reporting Percent Hospitalized Pediatric Patients with RSV in the ICU from Prior Week":
+ "pctconfrsvhosppatsicupedperchosprepabschg",
+};
// shortform:longform
export const nhsnSlugToNameMap = Object.fromEntries(
- Object.entries(nhsnNameToSlugMap).map(([name, slug]) => [slug, name])
+ Object.entries(nhsnNameToSlugMap).map(([name, slug]) => [slug, name]),
);
// change names for better appearance in column selector
export const nhsnNameToPrettyNameMap = {
- 'Week Ending Date': 'weekendingdate',
- 'Geographic aggregation': 'jurisdiction',
-
- 'Number of Inpatient Beds': 'Inpatient Beds',
- 'Number of Adult Inpatient Beds': 'Adult Inpatient Beds',
- 'Number of Pediatric Inpatient beds': 'Pediatric Inpatient Beds',
- 'Number of Inpatient Beds Occupied': 'Inpatient Beds Occupied',
- 'Number of Adult Inpatient Beds Occupied': 'Adult Inpatient Beds Occupied',
- 'Number of Pediatric Inpatient Beds Occupied': 'Pediatric Inpatient Beds Occupied',
- 'Number of ICU Beds': 'ICU Beds',
- 'Number of Adult ICU Beds': 'Adult ICU Beds',
- 'Number of Pediatric ICU Beds': 'Pediatric ICU Beds',
- 'Number of ICU Beds Occupied': 'ICU Beds Occupied',
- 'Number of Adult ICU Beds Occupied': 'Adult ICU Beds Occupied',
- 'Number of Pediatric ICU Beds Occupied': 'Pediatric ICU Beds Occupied',
- 'Number of Adult Patients Hospitalized with COVID-19': 'Adult Hospitalized',
- 'Number of Pediatric Patients Hospitalized with COVID-19': 'Pediatric Hospitalized',
- 'Total Patients Hospitalized with COVID-19': 'Total Hospitalized',
- 'Number of Adult Patients Hospitalized with Influenza': 'Adult Hospitalized',
- 'Number of Pedatric Patients Hospitalized with Influenza': 'Pediatric Hospitalized',
- 'Total Patients Hospitalized with Influenza': 'Total Hospitalized',
- 'Number of Adult Patients Hospitalized with RSV': 'Adult Hospitalized',
- 'Number of Pediatric Patients Hospitalized with RSV': 'Pediatric Hospitalized',
- 'Total Patients Hospitalized with RSV': 'Total Hospitalized',
- 'Number of Adult ICU Patients Hospitalized with COVID-19': 'Adult ICU Patients',
- 'Number of Pediatric ICU Patients Hospitalized with COVID-19': 'Pediatric ICU Patients',
- 'Total ICU Patients Hospitalized with COVID-19 ': 'Total ICU Patients',
- 'Number of Adult ICU Patients Hospitalized with Influenza': 'Adult ICU Patients',
- 'Number of Pediatric ICU Patients Hospitalized with Influenza': 'Pediatric ICU Patients',
- 'Total ICU Patients Hospitalized with Influenza': 'Total ICU Patients',
- 'Number of Adult ICU Patients Hospitalized with RSV': 'Adult ICU Patients',
- 'Number of Pediatric ICU Patients Hospitalized with RSV': 'Pediatric ICU Patients',
- 'Total ICU Patients Hospitalized with RSV': 'Total ICU Patients',
- 'Number of Pediatric COVID-19 Admissions, 0-4 years': 'Pediatric Admissions (0-4 years)',
- 'Number of Pediatric COVID-19 Admissions, 5-17 years': 'Pediatric Admissions (5-17 years)',
- 'Total Pediatric COVID-19 Admissions': 'Pediatric Admissions',
- 'Number of Adult COVID-19 Admissions, 18-49 years': 'Adult Admissions (18-49 years)',
- 'Number of Adult COVID-19 Admissions, 50-64 years': 'Adult Admissions (50-64 years)',
- 'Number of Adult COVID-19 Admissions, 65-74 years': 'Adult Admissions (65-74 years)',
- 'Number of Adult COVID-19 Admissions, 75+ years': 'Adult Admissions (75+ years)',
- 'Total Adult COVID-19 Admissions': 'Adult Admissions',
- 'Number of COVID-19 Admissions, unknown age': 'Admissions (unknown age)',
- 'Total COVID-19 Admissions': 'Total Admissions',
- 'Number of Pediatric Influenza Admissions, 0-4 years': 'Pediatric Admissions (0-4 years)',
- 'Number of Pediatric Influenza Admissions, 5-17 years': 'Pediatric Admissions (5-17 years)',
- 'Total Pediatric Influenza Admissions': 'Pediatric Admissions',
- 'Number of Adult Influenza Admissions, 18-49 years': 'Adult Admissions (18-49 years)',
- 'Number of Adult Influenza Admissions, 50-64 years': 'Adult Admissions (50-64 years)',
- 'Number of Adult Influenza Admissions, 65-74 years': 'Adult Admissions (65-74 years)',
- 'Number of Adult Influenza Admissions, 75+ years': 'Adult Admissions (75+ years)',
- 'Total Adult Influenza Admissions': 'Adult Admissions',
- 'Number of Influenza Admissions, unknown age': 'Admissions (unknown age)',
- 'Total Influenza Admissions': 'Total Admissions',
- 'Number of Pediatric RSV Admissions, 0-4 years': 'Pediatric Admissions (0-4 years)',
- 'Number of Pediatric RSV Admissions, 5-17 years': 'Pediatric Admissions (5-17 years)',
- 'Total Pediatric RSV Admissions': 'Pediatric Admissions',
- 'Number of Adult RSV Admissions, 18-49 years': 'Adult Admissions (18-49 years)',
- 'Number of Adult RSV Admissions, 50-64 years': 'Adult Admissions (50-64 years)',
- 'Number of Adult RSV Admissions, 65-74 years': 'Adult Admissions (65-74 years)',
- 'Number of Adult RSV Admissions, 75+ years': 'Adult Admissions (75+ years)',
- 'Total Adult RSV Admissions': 'Adult Admissions',
- 'Number of RSV Admissions, unknown age': 'Admissions (unknown age)',
- 'Total RSV Admissions': 'Total Admissions',
- 'Percent Inpatient Beds Occupied': 'Inpatient Beds Occupied',
- 'Percent Inpatient Beds Occupied by COVID-19 Patients': 'Inpatient Beds Occupied by COVID-19 Patients',
- 'Percent Inpatient Beds Occupied by Influenza Patients': 'Inpatient Beds Occupied by Influenza Patients',
- 'Percent Inpatient Beds Occupied by RSV Patients': 'Inpatient Beds Occupied by RSV Patients',
- 'Percent ICU Beds Occupied': 'ICU Beds Occupied',
- 'Percent ICU Beds Occupied by COVID-19 Patients': 'ICU Beds Occupied by COVID-19 Patients',
- 'Percent ICU Beds Occupied by Influenza Patients': 'ICU Beds Occupied by Influenza Patients',
- 'Percent ICU Beds Occupied by RSV Patients': 'ICU Beds Occupied by RSV Patients',
- 'Percent Adult COVID-19 Admissions': 'Adult Admissions',
- 'Percent Pediatric COVID-19 Admissions': 'Pediatric Admissions',
- 'Percent Adult Influenza Admissions': 'Adult Admissions',
- 'Percent Pediatric Influenza Admissions': 'Pediatric Admissions',
- 'Percent Adult RSV Admissions': 'Adult Admissions',
- 'Percent Pediatric RSV Admissions': 'Pediatric Admissions',
- 'Number of Pediatric COVID-19 Admissions, 0-4 years, per 100,000 population': 'Pediatric Admissions (0-4 years)',
- 'Number of Pediatric COVID-19 Admissions, 5-17 years, per 100,000 population': 'Pediatric Admissions (5-17 years)',
- 'Total Number of Pediatric COVID-19 Admissions per 100,000 population': 'Pediatric Admissions',
- 'Number of Adult COVID-19 Admissions, 18-49 years, per 100,000 population': 'Adult Admissions (18-49 years)',
- 'Number of Adult COVID-19 Admissions, 50-64 years, per 100,000 population': 'Adult Admissions (50-64 years)',
- 'Number of Adult COVID-19 Admissions, 65-74 years, per 100,000 population': 'Adult Admissions (65-74 years)',
- 'Number of Adult COVID-19 Admissions, 75+ years, per 100,000 population': 'Adult Admissions (75+ years)',
- 'Total Number of Adult COVID-19 Admissions per 100,000 population': 'Adult Admissions',
- 'Total number of COVID-19 Admissions per 100,000 population': 'Total Admissions',
- 'Number of Pediatric Influenza Admissions, 0-4 years, per 100,000 population': 'Pediatric Admissions (0-4 years)',
- 'Number of Pediatric Influenza Admissions, 5-17 years, per 100,000 population': 'Pediatric Admissions (5-17 years)',
- 'Total Number of Pediatric Influenza Admissions per 100,000 population': 'Pediatric Admissions',
- 'Number of Adult Influenza Admissions, 18-49 years, per 100,000 population': 'Adult Admissions (18-49 years)',
- 'Number of Adult Influenza Admissions, 50-64 years, per 100,000 population': 'Adult Admissions (50-64 years)',
- 'Number of Adult Influenza Admissions, 65-74 years, per 100,000 population': 'Adult Admissions (65-74 years)',
- 'Number of Adult Influenza Admissions, 75+ years, per 100,000 population': 'Adult Admissions (75+ years)',
- 'Total Number of Adult Influenza Admissions per 100,000 population': 'Adult Admissions',
- 'Total number of Influenza Admissions per 100,000 population': 'Total Admissions',
- 'Number of Pediatric RSV Admissions, 0-4 years, per 100,000 population': 'Pediatric Admissions (0-4 years)',
- 'Number of Pediatric RSV Admissions, 5-17 years, per 100,000 population': 'Pediatric Admissions (5-17 years)',
- 'Total Number of Pediatric RSV Admissions per 100,000 population': 'Pediatric Admissions',
- 'Number of Adult RSV Admissions, 18-49 years, per 100,000 population': 'Adult Admissions (18-49 years)',
- 'Number of Adult RSV Admissions, 50-64 years, per 100,000 population': 'Adult Admissions (50-64 years)',
- 'Number of Adult RSV Admissions, 65-74 years, per 100,000 population': 'Adult Admissions (65-74 years)',
- 'Number of Adult RSV Admissions, 75+ years, per 100,000 population': 'Adult Admissions (75+ years)',
- 'Total Number of Adult RSV Admissions per 100,000 population': 'Adult Admissions',
- 'Total number of RSV Admissions per 100,000 population': 'Total Admissions',
-}
\ No newline at end of file
+ "Week Ending Date": "weekendingdate",
+ "Geographic aggregation": "jurisdiction",
+
+ "Number of Inpatient Beds": "Inpatient Beds",
+ "Number of Adult Inpatient Beds": "Adult Inpatient Beds",
+ "Number of Pediatric Inpatient beds": "Pediatric Inpatient Beds",
+ "Number of Inpatient Beds Occupied": "Inpatient Beds Occupied",
+ "Number of Adult Inpatient Beds Occupied": "Adult Inpatient Beds Occupied",
+ "Number of Pediatric Inpatient Beds Occupied":
+ "Pediatric Inpatient Beds Occupied",
+ "Number of ICU Beds": "ICU Beds",
+ "Number of Adult ICU Beds": "Adult ICU Beds",
+ "Number of Pediatric ICU Beds": "Pediatric ICU Beds",
+ "Number of ICU Beds Occupied": "ICU Beds Occupied",
+ "Number of Adult ICU Beds Occupied": "Adult ICU Beds Occupied",
+ "Number of Pediatric ICU Beds Occupied": "Pediatric ICU Beds Occupied",
+ "Number of Adult Patients Hospitalized with COVID-19": "Adult Hospitalized",
+ "Number of Pediatric Patients Hospitalized with COVID-19":
+ "Pediatric Hospitalized",
+ "Total Patients Hospitalized with COVID-19": "Total Hospitalized",
+ "Number of Adult Patients Hospitalized with Influenza": "Adult Hospitalized",
+ "Number of Pedatric Patients Hospitalized with Influenza":
+ "Pediatric Hospitalized",
+ "Total Patients Hospitalized with Influenza": "Total Hospitalized",
+ "Number of Adult Patients Hospitalized with RSV": "Adult Hospitalized",
+ "Number of Pediatric Patients Hospitalized with RSV":
+ "Pediatric Hospitalized",
+ "Total Patients Hospitalized with RSV": "Total Hospitalized",
+ "Number of Adult ICU Patients Hospitalized with COVID-19":
+ "Adult ICU Patients",
+ "Number of Pediatric ICU Patients Hospitalized with COVID-19":
+ "Pediatric ICU Patients",
+ "Total ICU Patients Hospitalized with COVID-19 ": "Total ICU Patients",
+ "Number of Adult ICU Patients Hospitalized with Influenza":
+ "Adult ICU Patients",
+ "Number of Pediatric ICU Patients Hospitalized with Influenza":
+ "Pediatric ICU Patients",
+ "Total ICU Patients Hospitalized with Influenza": "Total ICU Patients",
+ "Number of Adult ICU Patients Hospitalized with RSV": "Adult ICU Patients",
+ "Number of Pediatric ICU Patients Hospitalized with RSV":
+ "Pediatric ICU Patients",
+ "Total ICU Patients Hospitalized with RSV": "Total ICU Patients",
+ "Number of Pediatric COVID-19 Admissions, 0-4 years":
+ "Pediatric Admissions (0-4 years)",
+ "Number of Pediatric COVID-19 Admissions, 5-17 years":
+ "Pediatric Admissions (5-17 years)",
+ "Total Pediatric COVID-19 Admissions": "Pediatric Admissions",
+ "Number of Adult COVID-19 Admissions, 18-49 years":
+ "Adult Admissions (18-49 years)",
+ "Number of Adult COVID-19 Admissions, 50-64 years":
+ "Adult Admissions (50-64 years)",
+ "Number of Adult COVID-19 Admissions, 65-74 years":
+ "Adult Admissions (65-74 years)",
+ "Number of Adult COVID-19 Admissions, 75+ years":
+ "Adult Admissions (75+ years)",
+ "Total Adult COVID-19 Admissions": "Adult Admissions",
+ "Number of COVID-19 Admissions, unknown age": "Admissions (unknown age)",
+ "Total COVID-19 Admissions": "Total Admissions",
+ "Number of Pediatric Influenza Admissions, 0-4 years":
+ "Pediatric Admissions (0-4 years)",
+ "Number of Pediatric Influenza Admissions, 5-17 years":
+ "Pediatric Admissions (5-17 years)",
+ "Total Pediatric Influenza Admissions": "Pediatric Admissions",
+ "Number of Adult Influenza Admissions, 18-49 years":
+ "Adult Admissions (18-49 years)",
+ "Number of Adult Influenza Admissions, 50-64 years":
+ "Adult Admissions (50-64 years)",
+ "Number of Adult Influenza Admissions, 65-74 years":
+ "Adult Admissions (65-74 years)",
+ "Number of Adult Influenza Admissions, 75+ years":
+ "Adult Admissions (75+ years)",
+ "Total Adult Influenza Admissions": "Adult Admissions",
+ "Number of Influenza Admissions, unknown age": "Admissions (unknown age)",
+ "Total Influenza Admissions": "Total Admissions",
+ "Number of Pediatric RSV Admissions, 0-4 years":
+ "Pediatric Admissions (0-4 years)",
+ "Number of Pediatric RSV Admissions, 5-17 years":
+ "Pediatric Admissions (5-17 years)",
+ "Total Pediatric RSV Admissions": "Pediatric Admissions",
+ "Number of Adult RSV Admissions, 18-49 years":
+ "Adult Admissions (18-49 years)",
+ "Number of Adult RSV Admissions, 50-64 years":
+ "Adult Admissions (50-64 years)",
+ "Number of Adult RSV Admissions, 65-74 years":
+ "Adult Admissions (65-74 years)",
+ "Number of Adult RSV Admissions, 75+ years": "Adult Admissions (75+ years)",
+ "Total Adult RSV Admissions": "Adult Admissions",
+ "Number of RSV Admissions, unknown age": "Admissions (unknown age)",
+ "Total RSV Admissions": "Total Admissions",
+ "Percent Inpatient Beds Occupied": "Inpatient Beds Occupied",
+ "Percent Inpatient Beds Occupied by COVID-19 Patients":
+ "Inpatient Beds Occupied by COVID-19 Patients",
+ "Percent Inpatient Beds Occupied by Influenza Patients":
+ "Inpatient Beds Occupied by Influenza Patients",
+ "Percent Inpatient Beds Occupied by RSV Patients":
+ "Inpatient Beds Occupied by RSV Patients",
+ "Percent ICU Beds Occupied": "ICU Beds Occupied",
+ "Percent ICU Beds Occupied by COVID-19 Patients":
+ "ICU Beds Occupied by COVID-19 Patients",
+ "Percent ICU Beds Occupied by Influenza Patients":
+ "ICU Beds Occupied by Influenza Patients",
+ "Percent ICU Beds Occupied by RSV Patients":
+ "ICU Beds Occupied by RSV Patients",
+ "Percent Adult COVID-19 Admissions": "Adult Admissions",
+ "Percent Pediatric COVID-19 Admissions": "Pediatric Admissions",
+ "Percent Adult Influenza Admissions": "Adult Admissions",
+ "Percent Pediatric Influenza Admissions": "Pediatric Admissions",
+ "Percent Adult RSV Admissions": "Adult Admissions",
+ "Percent Pediatric RSV Admissions": "Pediatric Admissions",
+ "Number of Pediatric COVID-19 Admissions, 0-4 years, per 100,000 population":
+ "Pediatric Admissions (0-4 years)",
+ "Number of Pediatric COVID-19 Admissions, 5-17 years, per 100,000 population":
+ "Pediatric Admissions (5-17 years)",
+ "Total Number of Pediatric COVID-19 Admissions per 100,000 population":
+ "Pediatric Admissions",
+ "Number of Adult COVID-19 Admissions, 18-49 years, per 100,000 population":
+ "Adult Admissions (18-49 years)",
+ "Number of Adult COVID-19 Admissions, 50-64 years, per 100,000 population":
+ "Adult Admissions (50-64 years)",
+ "Number of Adult COVID-19 Admissions, 65-74 years, per 100,000 population":
+ "Adult Admissions (65-74 years)",
+ "Number of Adult COVID-19 Admissions, 75+ years, per 100,000 population":
+ "Adult Admissions (75+ years)",
+ "Total Number of Adult COVID-19 Admissions per 100,000 population":
+ "Adult Admissions",
+ "Total number of COVID-19 Admissions per 100,000 population":
+ "Total Admissions",
+ "Number of Pediatric Influenza Admissions, 0-4 years, per 100,000 population":
+ "Pediatric Admissions (0-4 years)",
+ "Number of Pediatric Influenza Admissions, 5-17 years, per 100,000 population":
+ "Pediatric Admissions (5-17 years)",
+ "Total Number of Pediatric Influenza Admissions per 100,000 population":
+ "Pediatric Admissions",
+ "Number of Adult Influenza Admissions, 18-49 years, per 100,000 population":
+ "Adult Admissions (18-49 years)",
+ "Number of Adult Influenza Admissions, 50-64 years, per 100,000 population":
+ "Adult Admissions (50-64 years)",
+ "Number of Adult Influenza Admissions, 65-74 years, per 100,000 population":
+ "Adult Admissions (65-74 years)",
+ "Number of Adult Influenza Admissions, 75+ years, per 100,000 population":
+ "Adult Admissions (75+ years)",
+ "Total Number of Adult Influenza Admissions per 100,000 population":
+ "Adult Admissions",
+ "Total number of Influenza Admissions per 100,000 population":
+ "Total Admissions",
+ "Number of Pediatric RSV Admissions, 0-4 years, per 100,000 population":
+ "Pediatric Admissions (0-4 years)",
+ "Number of Pediatric RSV Admissions, 5-17 years, per 100,000 population":
+ "Pediatric Admissions (5-17 years)",
+ "Total Number of Pediatric RSV Admissions per 100,000 population":
+ "Pediatric Admissions",
+ "Number of Adult RSV Admissions, 18-49 years, per 100,000 population":
+ "Adult Admissions (18-49 years)",
+ "Number of Adult RSV Admissions, 50-64 years, per 100,000 population":
+ "Adult Admissions (50-64 years)",
+ "Number of Adult RSV Admissions, 65-74 years, per 100,000 population":
+ "Adult Admissions (65-74 years)",
+ "Number of Adult RSV Admissions, 75+ years, per 100,000 population":
+ "Adult Admissions (75+ years)",
+ "Total Number of Adult RSV Admissions per 100,000 population":
+ "Adult Admissions",
+ "Total number of RSV Admissions per 100,000 population": "Total Admissions",
+};
diff --git a/app/src/utils/paths.js b/app/src/utils/paths.js
index 85cc1f28..3a1c5d9e 100644
--- a/app/src/utils/paths.js
+++ b/app/src/utils/paths.js
@@ -1,6 +1,6 @@
export const getDataPath = (path) => {
- const baseUrl = import.meta.env.BASE_URL || '';
+ const baseUrl = import.meta.env.BASE_URL || "";
// Remove trailing slash from baseUrl if it exists
- const cleanBaseUrl = baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl;
+ const cleanBaseUrl = baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
return `${cleanBaseUrl}/processed_data/${path}`;
-};
\ No newline at end of file
+};
diff --git a/app/src/utils/plotDownloadName.js b/app/src/utils/plotDownloadName.js
new file mode 100644
index 00000000..2bbf48e9
--- /dev/null
+++ b/app/src/utils/plotDownloadName.js
@@ -0,0 +1,37 @@
+const DEFAULT_PREFIX = "respilens";
+const MAX_FILENAME_LENGTH = 120;
+
+const slugify = (value) => {
+ return value
+ .toLowerCase()
+ .replace(/[^a-z0-9]+/g, "-")
+ .replace(/-+/g, "-")
+ .replace(/^-|-$/g, "");
+};
+
+const trimLength = (value, maxLength) => {
+ if (value.length <= maxLength) return value;
+ return value.slice(0, maxLength).replace(/-+$/g, "");
+};
+
+export const buildPlotDownloadName = (fallback = "plot") => {
+ if (typeof window === "undefined" || !window.location) {
+ return `${DEFAULT_PREFIX}-${fallback}`;
+ }
+
+ const { pathname, search } = window.location;
+ const params = new URLSearchParams(search);
+
+ const rawView = params.get("view");
+ const rawLocation = params.get("location");
+
+ const viewPart = rawView
+ ? rawView.replace(/_/g, "-")
+ : pathname.replace(/\/+$/g, "").replace(/^\/+/g, "") || "home";
+ const locationPart = rawLocation ? rawLocation.toLowerCase() : "";
+
+ const combined = [DEFAULT_PREFIX, viewPart, locationPart]
+ .filter(Boolean)
+ .join("-");
+ return trimLength(slugify(combined), MAX_FILENAME_LENGTH);
+};
diff --git a/app/src/utils/respilensStorage.js b/app/src/utils/respilensStorage.js
index 6bb59ace..eefeb8ea 100644
--- a/app/src/utils/respilensStorage.js
+++ b/app/src/utils/respilensStorage.js
@@ -6,7 +6,7 @@
* Statistics are computed on-the-fly from stored data.
*/
-const STORAGE_KEY = 'respilens_forecastle_games';
+const STORAGE_KEY = "respilens_forecastle_games";
/**
* Check if localStorage is available
@@ -14,7 +14,7 @@ const STORAGE_KEY = 'respilens_forecastle_games';
*/
function isLocalStorageAvailable() {
try {
- const test = '__storage_test__';
+ const test = "__storage_test__";
localStorage.setItem(test, test);
localStorage.removeItem(test);
return true;
@@ -31,11 +31,11 @@ function isLocalStorageAvailable() {
function isValidGame(game) {
return (
game &&
- typeof game === 'object' &&
- typeof game.id === 'string' &&
- typeof game.challengeDate === 'string' &&
- typeof game.dataset === 'string' &&
- typeof game.location === 'string' &&
+ typeof game === "object" &&
+ typeof game.id === "string" &&
+ typeof game.challengeDate === "string" &&
+ typeof game.dataset === "string" &&
+ typeof game.location === "string" &&
Array.isArray(game.userForecasts) &&
Array.isArray(game.groundTruth) &&
Array.isArray(game.horizonDates)
@@ -62,7 +62,7 @@ function roundToDecimals(value, decimals) {
*/
export function getForecastleGames() {
if (!isLocalStorageAvailable()) {
- console.warn('localStorage is not available');
+ console.warn("localStorage is not available");
return [];
}
@@ -72,14 +72,14 @@ export function getForecastleGames() {
const parsed = JSON.parse(stored);
if (!Array.isArray(parsed)) {
- console.error('Stored data is not an array, resetting');
+ console.error("Stored data is not an array, resetting");
return [];
}
// Filter out invalid games
- return parsed.filter(game => isValidGame(game));
+ return parsed.filter((game) => isValidGame(game));
} catch (error) {
- console.error('Error reading Forecastle games from localStorage:', error);
+ console.error("Error reading Forecastle games from localStorage:", error);
return [];
}
}
@@ -99,7 +99,7 @@ export function getForecastleGames() {
*/
export function saveForecastleGame(gameData) {
if (!isLocalStorageAvailable()) {
- console.error('localStorage is not available');
+ console.error("localStorage is not available");
return false;
}
@@ -110,7 +110,7 @@ export function saveForecastleGame(gameData) {
const id = `${gameData.challengeDate}_${gameData.forecastDate}_${gameData.dataset}_${gameData.location}_${gameData.target}`;
// Check if this game already exists (replay protection)
- const existingIndex = games.findIndex(g => g.id === id);
+ const existingIndex = games.findIndex((g) => g.id === id);
const gameEntry = {
id,
@@ -120,13 +120,13 @@ export function saveForecastleGame(gameData) {
dataset: gameData.dataset,
location: gameData.location,
target: gameData.target,
- userForecasts: gameData.userForecasts.map(f => ({
+ userForecasts: gameData.userForecasts.map((f) => ({
horizon: f.horizon,
median: f.median,
lower95: f.lower95,
upper95: f.upper95,
lower50: f.lower50,
- upper50: f.upper50
+ upper50: f.upper50,
})),
groundTruth: gameData.groundTruth,
horizonDates: gameData.horizonDates,
@@ -143,13 +143,25 @@ export function saveForecastleGame(gameData) {
// Ensemble scores (rounded to 3 decimal places)
ensembleWIS: roundToDecimals(gameData.ensembleWIS, 3),
ensembleDispersion: roundToDecimals(gameData.ensembleDispersion, 3),
- ensembleUnderprediction: roundToDecimals(gameData.ensembleUnderprediction, 3),
- ensembleOverprediction: roundToDecimals(gameData.ensembleOverprediction, 3),
+ ensembleUnderprediction: roundToDecimals(
+ gameData.ensembleUnderprediction,
+ 3,
+ ),
+ ensembleOverprediction: roundToDecimals(
+ gameData.ensembleOverprediction,
+ 3,
+ ),
// Baseline scores (rounded to 3 decimal places)
baselineWIS: roundToDecimals(gameData.baselineWIS, 3),
baselineDispersion: roundToDecimals(gameData.baselineDispersion, 3),
- baselineUnderprediction: roundToDecimals(gameData.baselineUnderprediction, 3),
- baselineOverprediction: roundToDecimals(gameData.baselineOverprediction, 3),
+ baselineUnderprediction: roundToDecimals(
+ gameData.baselineUnderprediction,
+ 3,
+ ),
+ baselineOverprediction: roundToDecimals(
+ gameData.baselineOverprediction,
+ 3,
+ ),
};
if (existingIndex >= 0) {
@@ -167,11 +179,15 @@ export function saveForecastleGame(gameData) {
return true;
} catch (error) {
// Check for quota exceeded error
- if (error.name === 'QuotaExceededError' || error.code === 22) {
- console.error('localStorage quota exceeded. Consider clearing old games.');
- throw new Error('Storage quota exceeded. Please clear some game history.');
+ if (error.name === "QuotaExceededError" || error.code === 22) {
+ console.error(
+ "localStorage quota exceeded. Consider clearing old games.",
+ );
+ throw new Error(
+ "Storage quota exceeded. Please clear some game history.",
+ );
}
- console.error('Error saving Forecastle game to localStorage:', error);
+ console.error("Error saving Forecastle game to localStorage:", error);
return false;
}
}
@@ -183,7 +199,7 @@ export function saveForecastleGame(gameData) {
*/
export function getForecastleGame(id) {
const games = getForecastleGames();
- return games.find(g => g.id === id) || null;
+ return games.find((g) => g.id === id) || null;
}
/**
@@ -193,17 +209,17 @@ export function getForecastleGame(id) {
*/
export function deleteForecastleGame(id) {
if (!isLocalStorageAvailable()) {
- console.error('localStorage is not available');
+ console.error("localStorage is not available");
return false;
}
try {
const games = getForecastleGames();
- const filtered = games.filter(g => g.id !== id);
+ const filtered = games.filter((g) => g.id !== id);
localStorage.setItem(STORAGE_KEY, JSON.stringify(filtered));
return true;
} catch (error) {
- console.error('Error deleting Forecastle game:', error);
+ console.error("Error deleting Forecastle game:", error);
return false;
}
}
@@ -214,7 +230,7 @@ export function deleteForecastleGame(id) {
*/
export function clearForecastleGames() {
if (!isLocalStorageAvailable()) {
- console.error('localStorage is not available');
+ console.error("localStorage is not available");
return false;
}
@@ -222,7 +238,7 @@ export function clearForecastleGames() {
localStorage.removeItem(STORAGE_KEY);
return true;
} catch (error) {
- console.error('Error clearing Forecastle games:', error);
+ console.error("Error clearing Forecastle games:", error);
return false;
}
}
@@ -243,33 +259,33 @@ export function exportForecastleData() {
*/
export function importForecastleData(jsonData) {
if (!isLocalStorageAvailable()) {
- console.error('localStorage is not available');
+ console.error("localStorage is not available");
return false;
}
try {
const imported = JSON.parse(jsonData);
if (!Array.isArray(imported)) {
- throw new Error('Invalid data format: expected array');
+ throw new Error("Invalid data format: expected array");
}
// Validate all games
- const validGames = imported.filter(game => {
+ const validGames = imported.filter((game) => {
const valid = isValidGame(game);
if (!valid) {
- console.warn('Skipping invalid game during import:', game);
+ console.warn("Skipping invalid game during import:", game);
}
return valid;
});
if (validGames.length === 0) {
- throw new Error('No valid games found in import data');
+ throw new Error("No valid games found in import data");
}
localStorage.setItem(STORAGE_KEY, JSON.stringify(validGames));
return true;
} catch (error) {
- console.error('Error importing Forecastle data:', error);
+ console.error("Error importing Forecastle data:", error);
throw error; // Re-throw so caller can handle
}
}
diff --git a/app/src/utils/scaleUtils.js b/app/src/utils/scaleUtils.js
index 1b38c514..cb5cf244 100644
--- a/app/src/utils/scaleUtils.js
+++ b/app/src/utils/scaleUtils.js
@@ -20,7 +20,8 @@ const getYRangeFromTraces = (traces) => {
const buildSqrtTicks = ({
rawRange,
tickCount = 5,
- formatValue = (value) => value.toLocaleString(undefined, { maximumFractionDigits: 2 })
+ formatValue = (value) =>
+ value.toLocaleString(undefined, { maximumFractionDigits: 2 }),
}) => {
if (!rawRange || rawRange.length !== 2) return null;
const [rawMin, rawMax] = rawRange;
@@ -36,7 +37,7 @@ const buildSqrtTicks = ({
const rawTick = tickValue ** 2;
return {
tickvals: [tickValue],
- ticktext: [formatValue(rawTick)]
+ ticktext: [formatValue(rawTick)],
};
}
diff --git a/app/src/utils/tournamentAPI.js b/app/src/utils/tournamentAPI.js
index 0feae4ee..198e25da 100644
--- a/app/src/utils/tournamentAPI.js
+++ b/app/src/utils/tournamentAPI.js
@@ -3,7 +3,7 @@
* Handles communication with Google Sheets backend via Apps Script
*/
-import { TOURNAMENT_CONFIG } from '../config';
+import { TOURNAMENT_CONFIG } from "../config";
/**
* Make a GET request to the tournament API
@@ -15,11 +15,13 @@ const apiGet = async (action, params = {}) => {
const apiUrl = TOURNAMENT_CONFIG.apiUrl;
if (!apiUrl) {
- throw new Error('Tournament API URL not configured. Please set VITE_TOURNAMENT_API_URL in .env');
+ throw new Error(
+ "Tournament API URL not configured. Please set VITE_TOURNAMENT_API_URL in .env",
+ );
}
const url = new URL(apiUrl);
- url.searchParams.append('action', action);
+ url.searchParams.append("action", action);
Object.entries(params).forEach(([key, value]) => {
url.searchParams.append(key, value);
@@ -28,7 +30,7 @@ const apiGet = async (action, params = {}) => {
try {
// No headers needed for GET - avoids CORS preflight
const response = await fetch(url.toString(), {
- method: 'GET',
+ method: "GET",
});
if (!response.ok) {
@@ -38,12 +40,12 @@ const apiGet = async (action, params = {}) => {
const data = await response.json();
if (!data.success) {
- throw new Error(data.error || 'Unknown API error');
+ throw new Error(data.error || "Unknown API error");
}
return data;
} catch (error) {
- console.error('Tournament API GET error:', error);
+ console.error("Tournament API GET error:", error);
throw error;
}
};
@@ -57,15 +59,17 @@ const apiPost = async (payload) => {
const apiUrl = TOURNAMENT_CONFIG.apiUrl;
if (!apiUrl) {
- throw new Error('Tournament API URL not configured. Please set VITE_TOURNAMENT_API_URL in .env');
+ throw new Error(
+ "Tournament API URL not configured. Please set VITE_TOURNAMENT_API_URL in .env",
+ );
}
try {
// Use text/plain to avoid CORS preflight
const response = await fetch(apiUrl, {
- method: 'POST',
+ method: "POST",
headers: {
- 'Content-Type': 'text/plain',
+ "Content-Type": "text/plain",
},
body: JSON.stringify(payload),
});
@@ -77,12 +81,12 @@ const apiPost = async (payload) => {
const data = await response.json();
if (!data.success) {
- throw new Error(data.error || 'Unknown API error');
+ throw new Error(data.error || "Unknown API error");
}
return data;
} catch (error) {
- console.error('Tournament API POST error:', error);
+ console.error("Tournament API POST error:", error);
throw error;
}
};
@@ -94,17 +98,23 @@ const apiPost = async (payload) => {
*/
export const registerParticipant = async (name) => {
if (!name) {
- throw new Error('Name is required');
+ throw new Error("Name is required");
}
const data = await apiPost({
- action: 'register',
+ action: "register",
name: name.trim(),
});
// Store in localStorage
- localStorage.setItem(TOURNAMENT_CONFIG.storageKeys.participantId, data.participantId);
- localStorage.setItem(TOURNAMENT_CONFIG.storageKeys.participantName, name.trim());
+ localStorage.setItem(
+ TOURNAMENT_CONFIG.storageKeys.participantId,
+ data.participantId,
+ );
+ localStorage.setItem(
+ TOURNAMENT_CONFIG.storageKeys.participantName,
+ name.trim(),
+ );
return data;
};
@@ -116,17 +126,27 @@ export const registerParticipant = async (name) => {
* @param {Array|Object} forecasts - Array of forecast entries (one per horizon) or single forecast object for backward compatibility
* @returns {Promise
} Submission data {submissionId, message}
*/
-export const submitForecast = async (participantId, challengeNum, forecasts) => {
+export const submitForecast = async (
+ participantId,
+ challengeNum,
+ forecasts,
+) => {
if (!participantId) {
- throw new Error('Participant ID is required');
+ throw new Error("Participant ID is required");
}
- if (!challengeNum || challengeNum < 1 || challengeNum > TOURNAMENT_CONFIG.numChallenges) {
- throw new Error(`Challenge number must be between 1 and ${TOURNAMENT_CONFIG.numChallenges}`);
+ if (
+ !challengeNum ||
+ challengeNum < 1 ||
+ challengeNum > TOURNAMENT_CONFIG.numChallenges
+ ) {
+ throw new Error(
+ `Challenge number must be between 1 and ${TOURNAMENT_CONFIG.numChallenges}`,
+ );
}
if (!forecasts) {
- throw new Error('Forecast data is required');
+ throw new Error("Forecast data is required");
}
// Convert to array if single forecast object (backward compatibility)
@@ -134,13 +154,17 @@ export const submitForecast = async (participantId, challengeNum, forecasts) =>
// Validate that all forecasts have required fields
for (const forecast of forecastArray) {
- if (!forecast || forecast.median === null || forecast.median === undefined) {
- throw new Error('Each forecast must have a median value');
+ if (
+ !forecast ||
+ forecast.median === null ||
+ forecast.median === undefined
+ ) {
+ throw new Error("Each forecast must have a median value");
}
}
// Format forecasts for submission
- const formattedForecasts = forecastArray.map(f => ({
+ const formattedForecasts = forecastArray.map((f) => ({
horizon: f.horizon || 1,
median: f.median,
q25: f.q25 || f.lower50,
@@ -150,7 +174,7 @@ export const submitForecast = async (participantId, challengeNum, forecasts) =>
}));
const data = await apiPost({
- action: 'submitForecast',
+ action: "submitForecast",
participantId,
challengeNum,
forecasts: formattedForecasts,
@@ -158,7 +182,10 @@ export const submitForecast = async (participantId, challengeNum, forecasts) =>
});
// Update last sync time
- localStorage.setItem(TOURNAMENT_CONFIG.storageKeys.lastSync, new Date().toISOString());
+ localStorage.setItem(
+ TOURNAMENT_CONFIG.storageKeys.lastSync,
+ new Date().toISOString(),
+ );
return data;
};
@@ -168,7 +195,7 @@ export const submitForecast = async (participantId, challengeNum, forecasts) =>
* @returns {Promise} Leaderboard data
*/
export const getLeaderboard = async () => {
- const data = await apiGet('getLeaderboard');
+ const data = await apiGet("getLeaderboard");
return data.leaderboard || [];
};
@@ -179,10 +206,10 @@ export const getLeaderboard = async () => {
*/
export const getParticipant = async (participantId) => {
if (!participantId) {
- throw new Error('Participant ID is required');
+ throw new Error("Participant ID is required");
}
- const data = await apiGet('getParticipant', { participantId });
+ const data = await apiGet("getParticipant", { participantId });
return {
participant: data.participant,
diff --git a/app/src/utils/urlManager.js b/app/src/utils/urlManager.js
index 6618bbf3..696d0024 100644
--- a/app/src/utils/urlManager.js
+++ b/app/src/utils/urlManager.js
@@ -1,10 +1,10 @@
-import { DATASETS, APP_CONFIG } from '../config';
+import { DATASETS, APP_CONFIG } from "../config";
-const DEFAULT_CHART_SCALE = 'linear';
+const DEFAULT_CHART_SCALE = "linear";
const DEFAULT_INTERVAL_VISIBILITY = {
median: true,
ci50: true,
- ci95: true
+ ci95: true,
};
const DEFAULT_SHOW_LEGEND = true;
@@ -17,7 +17,9 @@ export class URLParameterManager {
// Get dataset from view type
getDatasetFromView(viewType) {
for (const dataset of Object.values(DATASETS)) {
- const hasMatchingView = dataset.views.some(view => view.value === viewType);
+ const hasMatchingView = dataset.views.some(
+ (view) => view.value === viewType,
+ );
if (hasMatchingView) {
return dataset;
}
@@ -26,65 +28,64 @@ export class URLParameterManager {
}
getDatasetParams(dataset) {
- if (!dataset) return {};
+ if (!dataset) return {};
const prefix = dataset.prefix;
const params = {};
- const currentView = this.getView();
+ const currentView = this.getView();
if (dataset.hasDateSelector) {
const dates = this.searchParams.get(`${prefix}_dates`);
- params.dates = dates ? dates.split(',') : [];
+ params.dates = dates ? dates.split(",") : [];
}
if (dataset.hasModelSelector) {
const models = this.searchParams.get(`${prefix}_models`);
- params.models = models ? models.split(',') : [];
+ params.models = models ? models.split(",") : [];
}
- if (currentView !== 'nhsnall') {
- const target = this.searchParams.get(`${prefix}_target`);
- if (target) {
- params.target = target;
- }
+ if (currentView !== "nhsnall") {
+ const target = this.searchParams.get(`${prefix}_target`);
+ if (target) {
+ params.target = target;
+ }
}
-
// Special case for NHSN
- if (dataset.shortName === 'nhsn') {
- params.columns = this.searchParams.get('nhsn_columns')?.split(',') || [];
+ if (dataset.shortName === "nhsn") {
+ params.columns = this.searchParams.get("nhsn_columns")?.split(",") || [];
}
return params;
}
getAdvancedParams() {
- const scaleParam = this.searchParams.get('scale');
- const intervalsParam = this.searchParams.get('intervals');
- const legendParam = this.searchParams.get('legend');
+ const scaleParam = this.searchParams.get("scale");
+ const intervalsParam = this.searchParams.get("intervals");
+ const legendParam = this.searchParams.get("legend");
const chartScale = scaleParam || DEFAULT_CHART_SCALE;
let intervalVisibility = { ...DEFAULT_INTERVAL_VISIBILITY };
- if (intervalsParam === 'none') {
+ if (intervalsParam === "none") {
intervalVisibility = {
median: false,
ci50: false,
- ci95: false
+ ci95: false,
};
} else if (intervalsParam) {
- const enabled = new Set(intervalsParam.split(',').filter(Boolean));
+ const enabled = new Set(intervalsParam.split(",").filter(Boolean));
intervalVisibility = {
- median: enabled.has('median'),
- ci50: enabled.has('ci50'),
- ci95: enabled.has('ci95')
+ median: enabled.has("median"),
+ ci50: enabled.has("ci50"),
+ ci95: enabled.has("ci95"),
};
}
let showLegend = DEFAULT_SHOW_LEGEND;
- if (legendParam === '0' || legendParam === 'false') {
+ if (legendParam === "0" || legendParam === "false") {
showLegend = false;
- } else if (legendParam === '1' || legendParam === 'true') {
+ } else if (legendParam === "1" || legendParam === "true") {
showLegend = true;
}
@@ -108,8 +109,8 @@ export class URLParameterManager {
newParams.delete(`${prefix}_target`);
- if (dataset.shortName === 'nhsn') {
- newParams.delete('nhsn_columns');
+ if (dataset.shortName === "nhsn") {
+ newParams.delete("nhsn_columns");
}
this.setSearchParams(newParams, { replace: true });
@@ -120,28 +121,30 @@ export class URLParameterManager {
if (chartScale) {
if (chartScale !== DEFAULT_CHART_SCALE) {
- updatedParams.set('scale', chartScale);
+ updatedParams.set("scale", chartScale);
} else {
- updatedParams.delete('scale');
+ updatedParams.delete("scale");
}
}
if (intervalVisibility) {
- const enabled = ['median', 'ci50', 'ci95'].filter(key => intervalVisibility[key]);
+ const enabled = ["median", "ci50", "ci95"].filter(
+ (key) => intervalVisibility[key],
+ );
if (enabled.length === 0) {
- updatedParams.set('intervals', 'none');
+ updatedParams.set("intervals", "none");
} else if (enabled.length === 3) {
- updatedParams.delete('intervals');
+ updatedParams.delete("intervals");
} else {
- updatedParams.set('intervals', enabled.join(','));
+ updatedParams.set("intervals", enabled.join(","));
}
}
- if (typeof showLegend === 'boolean') {
+ if (typeof showLegend === "boolean") {
if (showLegend !== DEFAULT_SHOW_LEGEND) {
- updatedParams.set('legend', showLegend ? '1' : '0');
+ updatedParams.set("legend", showLegend ? "1" : "0");
} else {
- updatedParams.delete('legend');
+ updatedParams.delete("legend");
}
}
@@ -156,59 +159,68 @@ export class URLParameterManager {
}
const updatedParams = new URLSearchParams(this.searchParams);
const prefix = dataset.prefix;
- const currentView = this.getView();
-
+ const currentView = this.getView();
- if (dataset.hasDateSelector && Object.prototype.hasOwnProperty.call(newParams, 'dates')) {
+ if (
+ dataset.hasDateSelector &&
+ Object.prototype.hasOwnProperty.call(newParams, "dates")
+ ) {
if (newParams.dates && newParams.dates.length > 0) {
- updatedParams.set(`${prefix}_dates`, newParams.dates.join(','));
+ updatedParams.set(`${prefix}_dates`, newParams.dates.join(","));
} else {
- updatedParams.delete(`${prefix}_dates`);
+ updatedParams.delete(`${prefix}_dates`);
}
}
- if (dataset.hasModelSelector && Object.prototype.hasOwnProperty.call(newParams, 'models')) {
+ if (
+ dataset.hasModelSelector &&
+ Object.prototype.hasOwnProperty.call(newParams, "models")
+ ) {
if (newParams.models && newParams.models.length > 0) {
- updatedParams.set(`${prefix}_models`, newParams.models.join(','));
+ updatedParams.set(`${prefix}_models`, newParams.models.join(","));
} else {
- updatedParams.delete(`${prefix}_models`);
+ updatedParams.delete(`${prefix}_models`);
}
}
-
- if (currentView !== 'nhsnall' && Object.prototype.hasOwnProperty.call(newParams, 'target')) {
- if (newParams.target) {
- updatedParams.set(`${prefix}_target`, newParams.target);
- } else {
- updatedParams.delete(`${prefix}_target`);
- }
+ if (
+ currentView !== "nhsnall" &&
+ Object.prototype.hasOwnProperty.call(newParams, "target")
+ ) {
+ if (newParams.target) {
+ updatedParams.set(`${prefix}_target`, newParams.target);
+ } else {
+ updatedParams.delete(`${prefix}_target`);
+ }
}
- if (dataset.shortName === 'nhsn' && Object.prototype.hasOwnProperty.call(newParams, 'columns')) {
+ if (
+ dataset.shortName === "nhsn" &&
+ Object.prototype.hasOwnProperty.call(newParams, "columns")
+ ) {
if (newParams.columns && newParams.columns.length > 0) {
- updatedParams.set('nhsn_columns', newParams.columns.join(','));
+ updatedParams.set("nhsn_columns", newParams.columns.join(","));
} else {
- updatedParams.delete('nhsn_columns');
+ updatedParams.delete("nhsn_columns");
}
}
// Only call setSearchParams if the parameters actually changed
if (updatedParams.toString() !== this.searchParams.toString()) {
- this.setSearchParams(updatedParams, { replace: true });
+ this.setSearchParams(updatedParams, { replace: true });
}
}
-
updateLocation(location, effectiveDefault = APP_CONFIG.defaultLocation) {
const newParams = new URLSearchParams(this.searchParams);
-
+
// If the location matches the specific default for this view, remove it from URL
if (location && location !== effectiveDefault) {
- newParams.set('location', location);
+ newParams.set("location", location);
} else {
- newParams.delete('location');
+ newParams.delete("location");
}
-
+
if (newParams.toString() !== this.searchParams.toString()) {
this.setSearchParams(newParams, { replace: true });
}
@@ -216,13 +228,15 @@ export class URLParameterManager {
// Get current location from URL
getLocation() {
- return this.searchParams.get('location') || APP_CONFIG.defaultLocation;
+ return this.searchParams.get("location") || APP_CONFIG.defaultLocation;
}
// Get current view from URL
getView() {
- const viewParam = this.searchParams.get('view');
- const allViews = Object.values(DATASETS).flatMap(ds => ds.views.map(v => v.value));
+ const viewParam = this.searchParams.get("view");
+ const allViews = Object.values(DATASETS).flatMap((ds) =>
+ ds.views.map((v) => v.value),
+ );
if (viewParam) {
if (viewParam === APP_CONFIG.defaultView) {
return viewParam;
@@ -237,6 +251,5 @@ export class URLParameterManager {
const defaultDatasetKey = APP_CONFIG.defaultDataset;
return DATASETS[defaultDatasetKey]?.defaultView;
}
- initializeDefaults() {
- }
+ initializeDefaults() {}
}
diff --git a/app/vite.config.js b/app/vite.config.js
index 3394a45d..a35feb7d 100644
--- a/app/vite.config.js
+++ b/app/vite.config.js
@@ -1,15 +1,15 @@
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
export default defineConfig({
- base: '/',
+ base: "/",
plugins: [react()],
server: {
watch: { usePolling: true },
- publicDir: 'public'
+ publicDir: "public",
},
build: {
- outDir: 'dist',
- assetsDir: 'assets'
- }
-});
\ No newline at end of file
+ outDir: "dist",
+ assetsDir: "assets",
+ },
+});
diff --git a/scripts/external_data.py b/scripts/external_data.py
index 9650261a..4648f8ef 100644
--- a/scripts/external_data.py
+++ b/scripts/external_data.py
@@ -42,7 +42,7 @@ class ExternalInputs:
}
PATHOGEN_TARGET_REQUIREMENTS: Dict[str, Set[str]] = {
- "flu": {"as_of", "target_end_date", "location", "observation"},
+ "flu": {"as_of", "target_end_date", "location", "observation", "target"},
"rsvforecasthub": {"as_of", "date", "location", "observation", "target"},
"covid19forecasthub": {"as_of", "date", "location", "observation", "target"},
}
diff --git a/scripts/external_to_projections.R b/scripts/external_to_projections.R
index 30f45806..861f0711 100644
--- a/scripts/external_to_projections.R
+++ b/scripts/external_to_projections.R
@@ -16,11 +16,11 @@ usage_text <- function() {
"",
"Arguments:",
" --output-path Directory where JSON files will be written.",
- " --pathogen Pathogen to process (flu, rsv, covid).",
- " --data-path Hubverse forecast export in CSV format.",
- " --target-data-path Hubverse target data (CSV or Parquet).",
- " --locations-data-path Location metadata CSV.",
- " --overwrite Overwrite existing files if present.",
+ " --pathogen Pathogen to process (flu, rsv, or covid).",
+ " --data-path Absolute path to Hubverse-style forecast data to be converted (.csv)",
+ " --target-data-path Absolute path to Hubverse-style target data that correspends to provided forecast (.csv or .parquet)",
+ " --locations-data-path Location metadata (.csv). Should match format of locations.csv files found in Hubverse auxiliary-data directories.",
+ " --overwrite Permission to overwrite existing files, if present.",
" --log-level Logging verbosity (DEBUG, INFO, WARNING, ERROR).",
" --help Show this message and exit.",
sep = "\n"
@@ -348,8 +348,14 @@ build_forecasts_key <- function(df, config) {
}
build_metadata_file <- function(data_df, locations_df) {
- location_entries <- lapply(seq_len(nrow(locations_df)), function(i) {
- row <- locations_df[i, , drop = FALSE]
+ data_locations <- unique(as.character(data_df$location))
+ filtered_locations <- locations_df[
+ as.character(locations_df$location) %in% data_locations,
+ ,
+ drop = FALSE
+ ]
+ location_entries <- lapply(seq_len(nrow(filtered_locations)), function(i) {
+ row <- filtered_locations[i, , drop = FALSE]
population_value <- row$population[[1]]
if (is.null(population_value) || is.na(population_value)) {
population_value <- NA_real_
@@ -371,18 +377,6 @@ build_metadata_file <- function(data_df, locations_df) {
)
}
-validate_payload <- function(payload, schema_path) {
- if (!requireNamespace("jsonvalidate", quietly = TRUE)) {
- warning("Package 'jsonvalidate' not installed; skipping schema validation.")
- return(invisible(TRUE))
- }
- json_text <- jsonlite::toJSON(payload, auto_unbox = TRUE, pretty = FALSE, na = "null")
- is_valid <- jsonvalidate::json_validate(json_text, schema = schema_path, engine = "ajv", verbose = TRUE)
- if (!isTRUE(is_valid)) {
- stop("Schema validation failed for generated payload.", call. = FALSE)
- }
-}
-
save_json_payload <- function(payload, path, overwrite) {
if (file.exists(path) && !overwrite) {
stop(sprintf("File already exists at %s. Re-run with --overwrite to replace it.", path), call. = FALSE)
@@ -499,10 +493,6 @@ main <- function() {
validate_location_coverage(forecast_df, locations_df, args$data_path, args$locations_data_path)
script_dir <- get_script_dir()
- schema_path <- file.path(script_dir, "schemas", "RespiLens_projections.schema.json")
- if (!file.exists(schema_path)) {
- stop(sprintf("Could not find schema file at %s", schema_path), call. = FALSE)
- }
outputs <- process_dataset(forecast_df, locations_df, target_df, config)
path_mapping <- list(flu = "flusight", rsvforecasthub = "rsvforecasthub", covid19forecasthub = "covid19forecasthub")
@@ -511,7 +501,6 @@ main <- function() {
dir.create(output_dir, recursive = TRUE, showWarnings = FALSE)
for (item in outputs) {
- validate_payload(item$payload, schema_path)
target_path <- file.path(output_dir, item$file_name)
save_json_payload(item$payload, target_path, args$overwrite)
}
diff --git a/scripts/external_to_projections.py b/scripts/external_to_projections.py
index efd819d3..a51ba8c6 100644
--- a/scripts/external_to_projections.py
+++ b/scripts/external_to_projections.py
@@ -32,16 +32,16 @@ def parse_args(argv: list[str] | None = None) -> argparse.Namespace:
required=True,
help="Pathogen to process (flu, rsvforecasthub, covid19forecasthub).",
)
- parser.add_argument("--data-path", required=True, help="Absolute path to Hubverse forecast data in CSV format.")
+ parser.add_argument("--data-path", required=True, help="Absolute path to Hubverse-style forecast data to be converted (.csv)")
parser.add_argument(
"--target-data-path",
required=True,
- help="Absolute path to Hubverse ground truth target data (CSV or Parquet).",
+ help="Absolute path to Hubverse-style target data that correspends to provided forecast (.csv or .parquet)",
)
parser.add_argument(
"--locations-data-path",
required=True,
- help="Absolute path to the location metadata CSV.",
+ help="Location metadata (.csv). Should match format of locations.csv files found in Hubverse auxiliary-data directories.",
)
parser.add_argument(
"--overwrite",
diff --git a/scripts/helper.py b/scripts/helper.py
index 46f8bf22..2785d056 100644
--- a/scripts/helper.py
+++ b/scripts/helper.py
@@ -59,6 +59,7 @@ def hubverse_df_preprocessor(df: pd.DataFrame, filter_quantiles: bool = True, fi
# Filter `output_type_id` values
categorical_ids = ['decrease', 'increase', 'large_decrease', 'large_increase', 'stable']
numeric_ids = [0.025, 0.25, 0.5, 0.75, 0.975]
+ df['output_type_id'] = df['output_type_id'].astype(object)
# Also valid, date-like values where target is 'peak' something
numeric_output_ids = pd.to_numeric(df['output_type_id'], errors='coerce')
is_categorical_id = df['output_type_id'].isin(categorical_ids)
diff --git a/scripts/hub_dataset_processor.py b/scripts/hub_dataset_processor.py
index a9ac4dfb..957dc495 100644
--- a/scripts/hub_dataset_processor.py
+++ b/scripts/hub_dataset_processor.py
@@ -48,6 +48,7 @@ def __init__(
self.locations_data = locations_data
self.target_data = target_data
self.config = config
+ self.locations_in_this_dump = set(self.df_data['location'])
self.is_metro_cast = is_metro_cast
if self.is_metro_cast: # necessary date filter for metrocast data
self.df_data = self.df_data[self.df_data['reference_date'] >= datetime.date(2025, 11, 19)]
@@ -337,8 +338,9 @@ def _build_metadata_file(self, all_models: list[str]) -> Dict[str, Any]:
"models": sorted(all_models),
"locations": [],
}
+ filtered_locations_data = self.locations_data[self.locations_data['location'].isin(self.locations_in_this_dump)]
if self.is_metro_cast: # different building for metrocast (stems from locations.csv structure)
- for _, row in self.locations_data.iterrows():
+ for _, row in filtered_locations_data.iterrows():
file_name = str(row["location"]) + "_flu_metrocast.json"
location_info = {
"location": self.output_dict[file_name]["metadata"]["location"],
@@ -348,7 +350,7 @@ def _build_metadata_file(self, all_models: list[str]) -> Dict[str, Any]:
}
metadata_file_contents["locations"].append(location_info)
else:
- for _, row in self.locations_data.iterrows():
+ for _, row in filtered_locations_data.iterrows():
location_info = {
"location": str(row["location"]),
"abbreviation": str(row["abbreviation"]),