@sjvair/monitor-map 4.0.3 → 4.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sjvair/monitor-map",
 	"description": "SJVAir's interactive monitor map",
-	"version": "4.0.3",
+	"version": "4.2.0",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SJVAir/monitor-map"
@@ -16,7 +16,8 @@
 		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",
 		"format": "prettier --write .",
 		"lint": "prettier --check . && eslint .",
-		"test": "vitest run"
+		"test": "vitest run",
+		"test:bundle": "npm run build:lib && node tests/bundle/check-bundle.mjs"
 	},
 	"type": "module",
 	"svelte": "./dist/lib/index.js",
@@ -26,6 +27,16 @@
 			"svelte": "./dist/lib/index.js",
 			"types": "./dist/lib/index.d.ts",
 			"default": "./dist/lib/index.js"
+		},
+		"./core": {
+			"svelte": "./dist/lib/core.js",
+			"types": "./dist/lib/core.d.ts",
+			"default": "./dist/lib/core.js"
+		},
+		"./routes": {
+			"svelte": "./dist/lib/lazy-routes.js",
+			"types": "./dist/lib/lazy-routes.d.ts",
+			"default": "./dist/lib/lazy-routes.js"
 		}
 	},
 	"files": [

package/src/lib/LazyMapLayout.svelte

@@ -0,0 +1,53 @@
+<script lang="ts">
+	import type { Component, Snippet } from "svelte";
+	import LoadScreen from "./LoadScreen.svelte";
+	import LoadError from "./LoadError.svelte";
+	import { loadMonitorDetailPanel, loadMonitorMapLayout } from "./lazy-chunks";
+	import { useMonitorMapRouter } from "./router-context";
+
+	interface Props {
+		children: Snippet;
+	}
+
+	let { children }: Props = $props();
+
+	const { route, basePath } = useMonitorMapRouter();
+
+	let Layout: Component<Props> | null = $state.raw(null);
+	let failed = $state(false);
+
+	function load() {
+		failed = false;
+		loadMonitorMapLayout().then(
+			(module) => (Layout = module.default),
+			(error) => {
+				console.error(error);
+				failed = true;
+			}
+		);
+	}
+
+	load();
+	// On a link straight to a monitor, fetch its panel alongside the layout; the panel's own
+	// wrapper only mounts (and would only ask for it) once the layout has arrived. A failure is
+	// reported by that wrapper when it asks again.
+	if (route.pathname.startsWith(`${basePath}/monitor/`)) {
+		loadMonitorDetailPanel().catch(() => {});
+	}
+</script>
+
+<!-- The layout renders the same LoadScreen from the same shared state, so it carries on
+     from this one without restarting. -->
+{#if Layout}
+	<Layout>{@render children()}</Layout>
+{:else}
+	<div class="relative h-full w-full">
+		<LoadScreen>
+			{#snippet error()}
+				{#if failed}
+					<LoadError message="Couldn't load the map." onretry={load} />
+				{/if}
+			{/snippet}
+		</LoadScreen>
+	</div>
+{/if}

package/src/lib/LazyMonitorDetailPanel.svelte

@@ -0,0 +1,33 @@
+<script lang="ts">
+	import type { Component } from "svelte";
+	import LoadError from "./LoadError.svelte";
+	import { loadMonitorDetailPanel } from "./lazy-chunks";
+
+	let Panel: Component | null = $state.raw(null);
+	let failed = $state(false);
+
+	function load() {
+		failed = false;
+		loadMonitorDetailPanel().then(
+			(module) => (Panel = module.default),
+			(error) => {
+				console.error(error);
+				failed = true;
+			}
+		);
+	}
+
+	load();
+</script>
+
+{#if Panel}
+	<Panel />
+{:else}
+	<div class="flex h-full w-full items-center justify-center bg-white">
+		{#if failed}
+			<LoadError message="Couldn't load this monitor." onretry={load} />
+		{:else}
+			<p class="text-sm text-gray-500">Loading…</p>
+		{/if}
+	</div>
+{/if}

package/src/lib/LoadError.svelte

@@ -0,0 +1,19 @@
+<script lang="ts">
+	interface Props {
+		message: string;
+		onretry: () => void;
+	}
+
+	let { message, onretry }: Props = $props();
+</script>
+
+<div class="flex flex-col items-center gap-3 px-4 text-center" role="alert">
+	<p class="text-gray-700">{message}</p>
+	<button
+		type="button"
+		class="rounded-md bg-gray-800 px-4 py-2 text-sm font-medium text-white hover:bg-gray-700"
+		onclick={onretry}
+	>
+		Try again
+	</button>
+</div>

package/src/lib/LoadScreen.svelte

@@ -23,8 +23,16 @@
 </script>
 
 <script lang="ts">
+	import type { Snippet } from "svelte";
 	import type { Attachment } from "svelte/attachments";
 
+	interface Props {
+		/** Rendered under the logo while the load screen is up, e.g. a load failure and a retry */
+		error?: Snippet;
+	}
+
+	let { error }: Props = $props();
+
 	const animationTrigger: Attachment<HTMLDivElement> = () => {
 		loadScreenState.entered = true;
 	};
@@ -32,7 +40,7 @@
 
 {#if loadScreenState.enabled}
 	<div
-		class="absolute top-0 left-0 z-50 flex h-full w-full items-center justify-center overflow-hidden bg-white"
+		class="absolute top-0 left-0 z-50 flex h-full w-full flex-col items-center justify-center gap-6 overflow-hidden bg-white"
 		{@attach animationTrigger}
 	>
 		<div class="flex justify-around gap-4">
@@ -64,5 +72,6 @@
 				class:opacity-0={!loadScreenState.entered}
 			/>
 		</div>
+		{@render error?.()}
 	</div>
 {/if}

package/src/lib/MonitorDetailPanel.svelte

@@ -1,11 +1,14 @@
 <script lang="ts">
-	import type { ComponentProps } from "svelte";
+	import { untrack, type ComponentProps } from "svelte";
 	import type { SJVAirEntryLevel } from "@sjvair/sdk";
 	import DataBox from "$lib/components/DataBox.svelte";
+	import LoadError from "$lib/LoadError.svelte";
 	import MonitorWidgetModal from "$lib/monitors/components/MonitorWidgetModal.svelte";
 	import MonitorSubscriptionManager from "$lib/monitors/components/MonitorSubscriptionManager.svelte";
 	import DataChart from "$lib/data-chart/DataChart.svelte";
 	import { monitorsManager } from "$lib";
+	import { MonitorDetailsState } from "$lib/monitors/monitor-details.svelte";
+	import { choosePanelPollutant } from "$lib/monitors/panel-pollutant";
 	import { useMonitorMapRouter } from "./router-context";
 	import { fetchTempByCoords } from "$lib/weather";
 	import { Colors, valueToColor } from "$lib/colors";
@@ -21,24 +24,75 @@
 	}
 	const { route, navigate, basePath } = useMonitorMapRouter();
 
-	const monitor = $derived(monitorsManager.latest?.get(route.params.id ?? ""));
+	// The panel fetches its own monitor: the map's readings only hold monitors that have a
+	// current reading for the map's pollutant.
+	const details = new MonitorDetailsState();
+	const meta = $derived(monitorsManager.meta);
+	// Shown only once the metadata is in too; labels and levels come from it.
+	const monitor = $derived(details.status === "ready" && meta ? details.monitor : null);
+
+	// Through a $derived: the router replaces `route.params` on every navigation, including
+	// a search-only change or Back to the same monitor, which must not reload the panel.
+	const routeId = $derived(route.params.id);
+	$effect(() => {
+		const id = routeId;
+		if (id) untrack(() => details.load(id));
+	});
+
+	// Bumped whenever the map's readings are replaced, i.e. its 2-minute refresh ran. The data
+	// box follows it; the chart decides for itself whether its date range can have new entries.
+	let refreshTick = $state(0);
+	let seenLatest = untrack(() => monitorsManager.latest);
+
+	$effect(() => {
+		const latest = monitorsManager.latest;
+		// Null while a pollutant change is loading; wait for the readings that follow.
+		if (!latest || latest === seenLatest) return;
+		// The first readings of a cold load arrive alongside this panel's own request.
+		const first = seenLatest === null;
+		seenLatest = latest;
+		if (first) return;
+		untrack(() => {
+			details.refresh();
+			refreshTick++;
+		});
+	});
+
+	const panel = $derived(
+		monitor && meta ? choosePanelPollutant(monitorsManager.pollutant, monitor, meta) : null
+	);
+	const reading = $derived(
+		monitor && panel?.pollutant && panel.hasReading ? monitor.latest[panel.pollutant] : undefined
+	);
+	// Set when the panel shows a different pollutant than the map is coloring by.
+	const pollutantNote = $derived.by(() => {
+		const mapPollutant = monitorsManager.pollutant;
+		if (!meta || !panel?.pollutant || !panel.hasReading || !mapPollutant) return;
+		if (panel.pollutant === mapPollutant) return;
+		const shown = meta.entryType(panel.pollutant).label;
+		const label = meta.entryType(mapPollutant).label;
+		// Mid-sentence: lowercase a plain word ("Ozone"), keep a symbol ("PM2.5") as written.
+		const missing = /^[A-Z][a-z]+$/.test(label) ? label.toLowerCase() : label;
+		return `Showing ${shown}. This monitor has no ${missing} readings.`;
+	});
+
 	let tempData: TempDataBox | undefined = $state();
 	const entryData: ComponentProps<typeof DataBox> | undefined = $derived.by(() => {
-		if (!monitor || !monitorsManager.meta) return;
+		if (!monitor || !meta || !panel?.pollutant || !reading) return;
 
-		const entryType = monitorsManager.meta.entryType(monitor.latest.entry_type);
+		const entryType = meta.entryType(panel.pollutant);
 		const level: SJVAirEntryLevel | undefined = getCurrentLevel(
-			monitor.latest.value,
+			reading.value,
 			entryType.asIter.levels!
 		);
 
-		const updateDuration = monitorsManager.meta.monitorType(monitor.type).expected_interval;
+		const updateDuration = meta.monitorType(monitor.type).expected_interval;
 
 		return {
 			color: level?.color ?? "",
 			header: entryType.label,
 			subheading: `(${updateDuration} avg)`,
-			value: Math.round(parseInt(monitor.latest.value, 10)).toString()
+			value: Math.round(parseInt(reading.value, 10)).toString()
 		};
 	});
 
@@ -49,15 +103,26 @@
 		{ min: 95, color: Colors.red }
 	];
 
+	// Re-run for each refreshed copy of the monitor, as before, but never show one monitor's
+	// temperature on another: cleared when the id changes, and a late answer is dropped.
+	let tempMonitorId: string | undefined;
 	$effect(() => {
-		if (monitor && monitor.position) {
-			fetchTempByCoords(monitor.position.coordinates).then((temperature) => {
+		const current = monitor;
+		const id = current?.id;
+		if (id !== tempMonitorId) {
+			tempMonitorId = id;
+			tempData = undefined;
+		}
+		if (!current?.position) return;
+		fetchTempByCoords(current.position.coordinates)
+			.then((temperature) => {
+				if (untrack(() => monitor?.id) !== id) return;
 				tempData = {
 					value: `${temperature}°F`,
 					color: valueToColor(temperature, tempColors)
 				};
-			});
-		}
+			})
+			.catch(console.error);
 	});
 </script>
 
@@ -104,24 +169,37 @@
 				{@render badge("location-on", monitor.county)}
 				{@render badge("location-searching", monitor.location)}
 			</div>
+			{#if pollutantNote}
+				<p class="text-center text-sm text-gray-600">{pollutantNote}</p>
+			{:else if panel && !panel.hasReading}
+				<p class="text-center text-sm text-gray-600">This monitor has no current readings.</p>
+			{/if}
 		{/if}
 	</div>
 
 	<div class="tall:overflow-y-auto flex flex-col items-center gap-12 p-5 pt-10">
-		{#if monitor}
-			<div class="flex w-full justify-around">
-				{#if tempData}
-					<DataBox color={tempData.color} header="Temperature" value={tempData.value} />
-				{/if}
-				{#if entryData}
-					<DataBox
-						color={entryData.color}
-						header={entryData.header}
-						subheading={entryData.subheading}
-						value={entryData.value}
-					/>
-				{/if}
-			</div>
+		{#if details.status === "not-found"}
+			<p class="text-gray-700" role="alert">Monitor not found.</p>
+		{:else if details.status === "failed"}
+			<LoadError message="Couldn't load this monitor." onretry={() => details.retry()} />
+		{:else if !monitor || !panel}
+			<p class="text-sm text-gray-500">Loading…</p>
+		{:else}
+			{#if tempData || entryData}
+				<div class="flex w-full justify-around">
+					{#if tempData}
+						<DataBox color={tempData.color} header="Temperature" value={tempData.value} />
+					{/if}
+					{#if entryData}
+						<DataBox
+							color={entryData.color}
+							header={entryData.header}
+							subheading={entryData.subheading}
+							value={entryData.value}
+						/>
+					{/if}
+				</div>
+			{/if}
 
 			<div class="tall:block hidden">
 				<MonitorWidgetModal monitorId={monitor.id} />
@@ -131,9 +209,11 @@
 				<MonitorSubscriptionManager monitorId={monitor.id} />
 			{/if}
 
-			<div class="w-full">
-				<DataChart {monitor} />
-			</div>
+			{#if panel.pollutant}
+				<div class="w-full">
+					<DataChart {monitor} pollutant={panel.pollutant} {refreshTick} />
+				</div>
+			{/if}
 
 			<div class="w-full">
 				<h3 class="font-semibold">Data Provided Courtesy Of:</h3>

package/src/lib/MonitorMapLayout.svelte

@@ -14,6 +14,7 @@
 		currentSelection,
 		parsePollutantParam
 	} from "$lib/options/pollutant-param";
+	import LoadError from "$lib/LoadError.svelte";
 	import Legend from "$lib/legend/Legend.svelte";
 	import {
 		fireSmokeLegendSections,
@@ -61,7 +62,21 @@
 		monitorsMapIntegration.enabled = false;
 	}
 
-	monitorsManager.init(route.search.pollutant);
+	// The load screen stays up until the monitors load, so a failure has to be shown on it.
+	let loadFailed = $state(false);
+
+	function loadMonitors() {
+		loadFailed = false;
+		// A rejected init() can be retried: a later call starts a fresh run.
+		monitorsManager.init(route.search.pollutant).catch((error) => {
+			console.error(error);
+			loadFailed = true;
+		});
+	}
+
+	loadMonitors();
+	// A previous instance of this layout stopped polling in onDestroy; init() is a no-op by now.
+	monitorsManager.resumeAutoUpdate();
 	collocationSitesManager.init();
 	hmsManager.init();
 	monitorsMapIntegration.onMonitorClick = (id: string) => {
@@ -127,6 +142,11 @@
 	knownRoutes={[`${basePath}/monitor/`]}
 	{basePath}
 >
+	{#snippet loadError()}
+		{#if loadFailed}
+			<LoadError message="Couldn't load air monitors." onretry={loadMonitors} />
+		{/if}
+	{/snippet}
 	{#snippet menu()}
 		<OptionsGroup>
 			<PollutantMenu />

package/src/lib/collocation-sites/collocations-map-integration.svelte.ts

@@ -1,6 +1,6 @@
 import { type Popup, type MapLayerEventType, type Map as MaptilerMap } from "@maptiler/sdk";
 import type { Geometry } from "geojson";
-import { mapManager } from "$lib/map/map.svelte";
+import { mapManager } from "$lib/map/map-manager.svelte.js";
 import { MapIconLayerIntegration } from "$lib/map/integrations/map-geojson-integration.svelte";
 import { CollocationIconManager, getCollocationIconId } from "./collocations-icon-manager.svelte";
 import { TooltipManager } from "$lib/map/integrations/tooltip.svelte";

package/src/lib/core.ts

@@ -0,0 +1,17 @@
+/**
+ * Light entry (`@sjvair/monitor-map/core`): what a host app needs at startup, without the map.
+ *
+ * Nothing imported here may reach @maptiler/sdk, @maptiler/weather or uplot at runtime;
+ * `npm run test:bundle` enforces it. Everything is re-exported from the same modules the
+ * main entry uses, so `monitorsManager` and the router context stay single instances
+ * whichever entries a host mixes.
+ */
+export {
+	ROUTER_KEY,
+	provideMonitorMapRouter,
+	useMonitorMapRouter,
+	type MonitorMapRouterApi
+} from "./router-context";
+export { monitorsManager } from "./monitors/monitors.svelte.js";
+export type { MonitorsManager, MonitorsInitOptions } from "./monitors/monitors.svelte.js";
+export type { MonitorsDataSource, MonitorsPollutant } from "./monitors/types";

package/src/lib/data-chart/DataChart.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
+	import { untrack } from "svelte";
 	import type { Attachment } from "svelte/attachments";
-	import type { MonitorLatestType } from "@sjvair/sdk";
 	import type { DateRange as CalendarRange } from "bits-ui";
 	import { parseAbsolute } from "@internationalized/date";
 	import { Maximize, SquareX } from "@lucide/svelte";
@@ -9,13 +9,23 @@
 	import { getMonitorEntriesCSVUrl } from "@sjvair/sdk/monitors";
 	import { format, parseISO } from "date-fns";
 	import { RangeCalendar } from "$lib/components/ui/range-calendar";
+	import type { PanelPollutant } from "../monitors/panel-pollutant";
+	import { monitorsManager } from "../monitors/monitors.svelte";
 	import { DataChartManager } from "./data-chart.svelte";
-	import { createDateRange } from "./DateRange";
-	import { fetchChartData } from "./requests";
+	import { createDateRange, extendToNow, includesToday } from "./DateRange";
+	import { fetchChartData, type ChartMonitor } from "./requests";
 	import { getChartConfig } from "./chart-utils";
-	import { monitorsManager } from "../monitors/monitors.svelte";
+	import { levelColors } from "./level-colors";
+
+	interface Props {
+		monitor: ChartMonitor;
+		/** The pollutant to chart. Independent of the pollutant the map is coloring by. */
+		pollutant: PanelPollutant;
+		/** Bumped by the owner whenever fresh data may exist; see the effect below. */
+		refreshTick?: number;
+	}
 
-	let { monitor }: { monitor: MonitorLatestType<"pm25" | "o3"> } = $props();
+	let { monitor, pollutant, refreshTick = 0 }: Props = $props();
 
 	const chartManager = new DataChartManager();
 	let expanded = $state(false);
@@ -34,7 +44,8 @@
 			format(parseISO(chartManager.dateRange.end), "MMM d, yyyy")
 	);
 
-	const noChartData = $derived(!chartManager.chartData.length);
+	// A request with no entries still resolves to [[], []], so test the x axis, not the tuple.
+	const noChartData = $derived(!chartManager.chartData[0]?.length);
 	const message = $derived(
 		chartManager.loading
 			? "Loading Data"
@@ -42,10 +53,38 @@
 				? "No Data Available For Selected Date Range"
 				: ""
 	);
-	const pollutantLabel = $derived(monitorsManager.pollutant === "pm25" ? "PM 2.5" : "Ozone");
+	const pollutantLabel = $derived(pollutant === "pm25" ? "PM 2.5" : "Ozone");
+	// Level definitions are shared metadata, not the map's current selection.
+	const colors = $derived(
+		levelColors(monitorsManager.meta?.entryType(pollutant).asIter.levels ?? [])
+	);
 
+	// Reload for another monitor or pollutant, not for a new object describing the same one.
+	// Both go through a $derived: the owner recomputes what it passes on every refresh, and a
+	// prop read directly would re-run this effect even when the value is unchanged.
+	const monitorId = $derived(monitor.id);
+	const chartPollutant = $derived(pollutant);
 	$effect(() => {
-		if (monitor) loadChartData();
+		void monitorId;
+		void chartPollutant;
+		untrack(() => loadChartData());
+	});
+
+	// Whether the chosen range ended on the day it was chosen, so it should follow the present.
+	// Remembered, not re-tested per tick: a panel left open past midnight keeps following.
+	let live = includesToday(chartManager.dateRange);
+	let seenTick = untrack(() => refreshTick);
+
+	// A range that ended in the past cannot gain entries, so only a live one reloads.
+	$effect(() => {
+		const tick = refreshTick;
+		if (tick === seenTick) return;
+		seenTick = tick;
+		if (!live) return;
+		untrack(() => {
+			chartManager.dateRange = extendToNow(chartManager.dateRange);
+			loadChartData({ silent: true });
+		});
 	});
 
 	$effect(() => {
@@ -82,7 +121,7 @@
 			instance?.destroy?.();
 			el.innerHTML = "";
 			const maxDiff = Math.max(...flatData) - Math.min(...flatData);
-			const opts = getChartConfig(monitor.type, maxDiff, width, height);
+			const opts = getChartConfig(monitor.type, maxDiff, width, height, colors, pollutantLabel);
 			instance = new uPlot(opts, chartManager.chartData, el);
 		};
 
@@ -103,9 +142,19 @@
 		};
 	};
 
-	async function loadChartData() {
-		chartManager.loading = true;
-		chartManager.chartData = await fetchChartData(monitor, chartManager.dateRange);
+	let chartRequest = 0;
+
+	// `silent` keeps the current chart on screen while a timed refresh loads.
+	async function loadChartData({ silent = false } = {}) {
+		const request = ++chartRequest;
+		if (!silent) chartManager.loading = true;
+		const data = await fetchChartData(monitor, chartManager.dateRange, pollutant);
+		// A newer request (another range, monitor, pollutant or refresh) owns the chart now.
+		if (request !== chartRequest) return;
+		// A failed request resolves to [] (an empty range is [[], []]); a background refresh
+		// that failed keeps the chart already on screen.
+		if (silent && data.length === 0) return;
+		chartManager.chartData = data;
 		chartManager.loading = false;
 	}
 
@@ -113,6 +162,7 @@
 		if (calendarValue?.start && calendarValue?.end) {
 			dataRange = calendarValue;
 			chartManager.dateRange = createDateRange(dataRange.start, dataRange.end);
+			live = includesToday(chartManager.dateRange);
 			calendarOpen = false;
 			loadChartData();
 		}
@@ -121,7 +171,7 @@
 	function downloadCSV() {
 		const url = getMonitorEntriesCSVUrl({
 			monitorId: monitor.id,
-			entryType: monitorsManager.pollutant ?? "pm25",
+			entryType: pollutant,
 			timestampGte: chartManager.dateRange.start,
 			timestampLte: chartManager.dateRange.end
 		});

package/src/lib/data-chart/DateRange.ts

@@ -1,4 +1,4 @@
-import { subDays, startOfDay, endOfDay, isToday } from "date-fns";
+import { subDays, startOfDay, endOfDay, isToday, parseISO } from "date-fns";
 import type { DateValue } from "@internationalized/date";
 
 export type DateRange = { start: string; end: string };
@@ -20,3 +20,13 @@ export function createDateRange(start?: DateValue, end?: DateValue): DateRange {
 		end: endDate.toISOString()
 	};
 }
+
+/** Whether the range ends on the current calendar day, i.e. it can still gain entries. */
+export function includesToday(range: DateRange): boolean {
+	return isToday(parseISO(range.end));
+}
+
+/** The same range with its end moved to the present. */
+export function extendToNow(range: DateRange): DateRange {
+	return { start: range.start, end: new Date().toISOString() };
+}