Skip to content

Commit 548eee3

Browse files
committed
feat: use core states only without territory
1 parent 4d71806 commit 548eee3

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

src/data/regions.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ Object.entries(stateClasses).forEach(([key, value]) => {
8282
Object.assign(stateLookup.get(v.toLowerCase())!, { region: key });
8383
}
8484
});
85+
/**
86+
* core US state without territories
87+
*/
88+
export const stateCoreInfo = stateInfo.filter((d) => d.region != null);
8589

8690
export const nationInfo: RegionInfo = {
8791
level: 'nation',

src/modes/indicator-status/IndicatorData.svelte

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script>
2-
import { isMobileDevice, metaDataManager } from '../../stores';
2+
import { getLevelInfo, isMobileDevice, metaDataManager } from '../../stores';
33
import { DataFetcher } from '../../stores/DataFetcher';
44
import Toggle from '../../components/Toggle.svelte';
55
import Vega from '../../components/vega/Vega.svelte';
@@ -136,6 +136,9 @@
136136
{data}
137137
signals={{ highlight_tuple: resetOnClearHighlighTuple(timeFrame.max), highlightRegion: highlightAsOf }}
138138
signalListeners={['highlight']}
139+
noDataText={!sensor || !region || sensor.levels.includes(region.level)
140+
? 'No data available'
141+
: `${getLevelInfo(region.level).label} level is not supported`}
139142
on:signal={onSignal}
140143
/>
141144
</div>

src/modes/indicator-status/IndicatorSource.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
}
149149
}}
150150
/>
151-
<FancyHeader invert sub="Map ({formatDateISO(pickedDate)})"
151+
<FancyHeader invert sub="Map ({isRefWeekly ? formatWeek(pickedDate) : formatDateISO(pickedDate)})"
152152
>{resolvedSource ? resolvedSource.name : '?'}</FancyHeader
153153
>
154154
</div>

src/modes/indicator-status/data.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { timeDay } from 'd3-time';
22
import { callBackfillAPI, callCoverageAPI, CoverageRow, EpiDataBackfillRow, ParsedCoverageRow } from '../../data/api';
33
import { GeoPair, SourceSignalPair, TimePair } from '../../data/apimodel';
44
import type { EpiDataMetaParsedInfo, MetaDataManager, SensorLike, SensorSource } from '../../data/meta';
5-
import { countyInfo, RegionLevel, stateInfo } from '../../data/regions';
5+
import { countyInfo, RegionLevel, stateCoreInfo } from '../../data/regions';
66
import { parseAPIDateAndWeek, parseAPITime, toTimeValue } from '../../data/utils';
77
import { Sensor, TimeFrame } from '../../stores/params';
88
import { addNameInfos, EpiDataRow } from '../../data';
@@ -145,7 +145,7 @@ export function getAvailableCounties(
145145
}
146146

147147
export function fetchCoverage(ref: Sensor, coverageLevel: 'county' | 'state'): Promise<ParsedCoverageRow[]> {
148-
const total = coverageLevel === 'county' ? countyInfo.length : stateInfo.length;
148+
const total = coverageLevel === 'county' ? countyInfo.length : stateCoreInfo.length;
149149
return callCoverageAPI(
150150
ref.isWeeklySignal ? 'week' : 'day',
151151
SourceSignalPair.from(ref),

0 commit comments

Comments
 (0)