@sjvair/monitor-map 4.1.0 → 4.3.0

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,34 @@
 		};
 	};
 
-	async function loadChartData() {
-		chartManager.loading = true;
-		chartManager.chartData = await fetchChartData(monitor, chartManager.dateRange);
+	let chartRequest = 0;
+	let chartController: AbortController | undefined;
+
+	// A closed panel cancels its in-flight fetch.
+	$effect(() => () => chartController?.abort());
+
+	// `silent` keeps the current chart on screen while a timed refresh loads.
+	async function loadChartData({ silent = false } = {}) {
+		const request = ++chartRequest;
+		chartController?.abort();
+		const controller = (chartController = new AbortController());
+		if (!silent) chartManager.loading = true;
+		let data: Awaited<ReturnType<typeof fetchChartData>>;
+		try {
+			data = await fetchChartData(monitor, chartManager.dateRange, pollutant, {
+				signal: controller.signal
+			});
+		} catch (err) {
+			// Superseded or closed: the newer call owns `loading` and the chart, so leave both.
+			if (controller.signal.aborted) return;
+			throw err;
+		}
+		// 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 +177,7 @@
 		if (calendarValue?.start && calendarValue?.end) {
 			dataRange = calendarValue;
 			chartManager.dateRange = createDateRange(dataRange.start, dataRange.end);
+			live = includesToday(chartManager.dateRange);
 			calendarOpen = false;
 			loadChartData();
 		}
@@ -121,7 +186,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() };
+}

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

@@ -1,4 +1,4 @@
-import { monitorsManager } from "../monitors/monitors.svelte";
+import type { LevelColors } from "./level-colors";
 import { tooltipsPlugin, uPlotCursorConfig } from "./tooltip";
 import { fromUnixTime, getUnixTime, isToday, isAfter } from "date-fns";
 import type uPlot from "uplot";
@@ -6,15 +6,6 @@ import type { MonitorType } from "@sjvair/sdk";
 
 const PM25_AVG_60_STROKE = "3572b0";
 
-function getColors(): Array<[number, string]> {
-	const levels = monitorsManager.levels ?? [];
-	const colors = levels.map((level) => [level.range[0], level.color.replace(/^#/, "")]) as Array<
-		[number, string]
-	>;
-	colors.push([Infinity, "000000"]);
-	return colors;
-}
-
 const baseXSeriesConfig = {};
 
 const baseYSeriesConfig = {
@@ -23,26 +14,33 @@ const baseYSeriesConfig = {
 	width: 1
 };
 
-const pm25SeriesConfig = {
+/** The level stops plus a final black stop, so values above the top level still get a color. */
+function gradientStops(colors: LevelColors): LevelColors {
+	return [...colors, [Infinity, "000000"]];
+}
+
+const pm25SeriesConfig = (stops: LevelColors) => ({
 	...baseYSeriesConfig,
 	label: "Real Time",
 	width: 2,
-	stroke: (u: uPlot) => scaleGradient(u, "y", 1, getColors(), true)
-};
+	stroke: (u: uPlot) => scaleGradient(u, "y", 1, stops, true)
+});
 
-const pm25Avg60SeriesConfig = {
+const pm25Avg60SeriesConfig = (stops: LevelColors) => ({
 	...baseYSeriesConfig,
 	label: "60 Minute Average",
-	stroke: (u: uPlot) => autograd(u, PM25_AVG_60_STROKE)
-};
+	stroke: (u: uPlot) => autograd(u, PM25_AVG_60_STROKE, stops)
+});
 
 export function getChartConfig(
 	sourceName: MonitorType,
 	maxDiff: number,
 	width: number,
-	height: number
+	height: number,
+	colors: LevelColors,
+	label: string
 ): uPlot.Options {
-	const series: Array<uPlot.Series> = getSeriesConfigs(sourceName);
+	const series: Array<uPlot.Series> = getSeriesConfigs(sourceName, gradientStops(colors));
 	const getStroke = (u: uPlot, sIdx: number): string => {
 		const stroke = series[sIdx].stroke! as (u: uPlot, sIdx: number) => string | CanvasGradient;
 		return stroke(u, sIdx) as string;
@@ -51,7 +49,7 @@ export function getChartConfig(
 	return {
 		width,
 		height,
-		cursor: uPlotCursorConfig.get(),
+		cursor: uPlotCursorConfig.get(colors),
 		// @ts-expect-error: select missing pseudo "required" options
 		select: {
 			show: false
@@ -94,7 +92,7 @@ export function getChartConfig(
 				}
 			},
 			{
-				label: monitorsManager.pollutant === "pm25" ? "PM 2.5" : "Ozone",
+				label,
 				side: 3,
 				values: (_: uPlot, ticks: number[]) =>
 					ticks.map((v: number) => v.toFixed(maxDiff < 5 ? 1 : 0))
@@ -106,9 +104,8 @@ export function getChartConfig(
 	};
 }
 
-function getSeriesConfigs(monitorType: MonitorType) {
-	const singleSeriesConfig = Object.assign({}, pm25Avg60SeriesConfig);
-	singleSeriesConfig.width = 2;
+function getSeriesConfigs(monitorType: MonitorType, stops: LevelColors) {
+	const singleSeriesConfig = { ...pm25Avg60SeriesConfig(stops), width: 2 };
 
 	switch (monitorType) {
 		case "airnow":
@@ -120,15 +117,15 @@ function getSeriesConfigs(monitorType: MonitorType) {
 
 		case "airgradient":
 		case "purpleair":
-			return [baseXSeriesConfig, pm25SeriesConfig];
+			return [baseXSeriesConfig, pm25SeriesConfig(stops)];
 	}
 }
 
-function autograd(u: uPlot, fallback: string) {
+function autograd(u: uPlot, fallback: string, stops: LevelColors) {
 	if (u.series.length > 2) {
 		return fallback;
 	}
-	return scaleGradient(u, "y", 1, getColors(), true);
+	return scaleGradient(u, "y", 1, stops, true);
 }
 
 function scaleGradient(

package/src/lib/data-chart/level-colors.ts

@@ -0,0 +1,13 @@
+/** Color stops for a chart: each level's lower bound and its hex color without the `#`. */
+export type LevelColors = Array<[number, string]>;
+
+// `range` is loose on purpose: the SDK types it as a tuple with an open tail, and only its
+// first member (the level's lower bound) is read.
+export function levelColors(
+	levels: ReadonlyArray<{
+		range: readonly [number, ...unknown[]] | readonly number[];
+		color: string;
+	}>
+): LevelColors {
+	return levels.map((level) => [level.range[0], level.color.replace(/^#/, "")]);
+}

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

@@ -1,18 +1,27 @@
-import { getMonitorEntries, type MonitorEntry, type MonitorLatestType } from "@sjvair/sdk";
+import { getMonitorEntries, type MonitorDetails, type MonitorEntry } from "@sjvair/sdk";
 import { getUnixTime, parseISO, differenceInMinutes, addMinutes } from "date-fns";
-import { monitorsManager } from "../monitors/monitors.svelte";
+import type { PanelPollutant } from "../monitors/panel-pollutant";
 import type { DateRange } from "./DateRange";
+import type { SignalOptions } from "$lib/abort";
+
+/** The monitor fields the chart reads. */
+export type ChartMonitor = Pick<MonitorDetails, "id" | "name" | "type" | "data_source">;
 
 export async function fetchChartData(
-	m: MonitorLatestType<"pm25" | "o3">,
-	d: DateRange
+	m: ChartMonitor,
+	d: DateRange,
+	entryType: PanelPollutant,
+	options: SignalOptions = {}
 ): Promise<uPlot.AlignedData> {
-	return await getMonitorEntries({
-		entryType: monitorsManager.pollutant ?? "pm25",
-		monitorId: m.id,
-		timestampGte: d.start,
-		timestampLte: d.end
-	})
+	return await getMonitorEntries(
+		{
+			entryType,
+			monitorId: m.id,
+			timestampGte: d.start,
+			timestampLte: d.end
+		},
+		{ signal: options.signal }
+	)
 		.then((entries) => {
 			const xAxisData: Array<Date> = [];
 			const updateDuration = m.data_source.name === "PurpleAir" ? 2 : 60;
@@ -37,6 +46,8 @@ export async function fetchChartData(
 			return [xAxisData.map((d) => getUnixTime(d)), yAxisRecord] as uPlot.AlignedData;
 		})
 		.catch((err) => {
+			// A cancelled request is not a failure: let the caller see the reason, log nothing.
+			if (options.signal?.aborted) throw options.signal.reason;
 			console.error("Failed to load chart data: ", err);
 			return [] as uPlot.AlignedData;
 		});

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

@@ -1,12 +1,5 @@
 import { format, fromUnixTime } from "date-fns";
-import { monitorsManager } from "../monitors/monitors.svelte";
-
-function getColors(): Array<[number, string]> {
-	return (monitorsManager.levels ?? []).map((level) => [
-		level.range[0],
-		level.color.replace(/^#/, "")
-	]) as Array<[number, string]>;
-}
+import type { LevelColors } from "./level-colors";
 
 let cursLeft = -100;
 let cursTop = -100;
@@ -16,7 +9,7 @@ export const uPlotCursorConfig = {
 		cursLeft = left;
 		cursTop = top;
 	},
-	get: (): uPlot.Cursor => ({
+	get: (colors: LevelColors): uPlot.Cursor => ({
 		left: cursLeft,
 		top: cursTop,
 		y: false,
@@ -24,7 +17,6 @@ export const uPlotCursorConfig = {
 			size: 7,
 			fill: (u: uPlot, sIdx: number) => {
 				const xIdx = u.cursor.idxs![sIdx];
-				const colors = getColors();
 
 				if (xIdx != null && u.series.length >= 2 && sIdx === 1) {
 					const val = u.data[sIdx][xIdx]!;

package/src/lib/ev-stations/ev-stations-map-integration.svelte.ts

@@ -188,8 +188,9 @@ class EvStationsMapIntegration
 			clickManager.unregister([this.referenceId]);
 			this.tooltipManager.disable();
 			this.renderer.remove();
-			this.icons.loadIcons().then(() => {
-				if (mapManager.styleLoading) return;
+			// Clustering may be toggled again before the icons arrive; only the latest apply runs.
+			this.supersedePending();
+			this.whenIconsLoad(() => {
 				this.renderer.apply(this.handleStationClick);
 				this.tooltipManager.enable();
 			});
@@ -198,8 +199,7 @@ class EvStationsMapIntegration
 			this.tooltipManager.disable();
 			clickManager.unregister([this.referenceId]);
 			super.apply();
-			this.icons.loadIcons().then(() => {
-				if (mapManager.styleLoading) return;
+			this.whenIconsLoad(() => {
 				clickManager.register([this.referenceId], this.handleStationClick);
 				this.tooltipManager.enable();
 			});

package/src/lib/ev-stations/ev-stations.svelte.ts

@@ -5,6 +5,7 @@ import {
 	evNetworkTypes,
 	facilityTypes
 } from "./data-maps";
+import type { SignalOptions } from "$lib/abort";
 import type { EvStation } from "./types";
 import * as ZipCodes from "./zip-codes";
 
@@ -12,12 +13,12 @@ class EvStationsManager {
 	lvl2Stations: Array<EvStation> | undefined = $state();
 	lvl3Stations: Array<EvStation> | undefined = $state();
 
-	async loadLvl3Stations(): Promise<void> {
-		this.lvl3Stations = await fetchEvStations("dc_fast");
+	async loadLvl3Stations({ signal }: SignalOptions = {}): Promise<void> {
+		this.lvl3Stations = await fetchEvStations("dc_fast", signal);
 	}
 
-	async loadLvl2Stations(): Promise<void> {
-		this.lvl2Stations = await fetchEvStations("2");
+	async loadLvl2Stations({ signal }: SignalOptions = {}): Promise<void> {
+		this.lvl2Stations = await fetchEvStations("2", signal);
 	}
 }
 
@@ -25,7 +26,11 @@ const zipCodes = Object.values(ZipCodes)
 	.reduce((prev, curr) => prev.concat(curr))
 	.join(",");
 
-async function fetchEvStations(chargingLevel: "2" | "dc_fast"): Promise<Array<EvStation>> {
+async function fetchEvStations(
+	chargingLevel: "2" | "dc_fast",
+	signal?: AbortSignal
+): Promise<Array<EvStation>> {
+	if (signal?.aborted) throw signal.reason;
 	const url = new URL(`https://developer.nlr.gov/api/alt-fuel-stations/v1.json`);
 	url.searchParams.set("fuel_type", "ELEC");
 	url.searchParams.set("state", "CA");
@@ -35,7 +40,7 @@ async function fetchEvStations(chargingLevel: "2" | "dc_fast"): Promise<Array<Ev
 	url.searchParams.set("zip", zipCodes);
 	url.searchParams.set("api_key", import.meta.env.VITE_NREL_KEY);
 
-	return await fetch(url)
+	return await fetch(url, { signal })
 		.then(async (res) => await res.json())
 		.then((data) => {
 			const fuelStations: Array<EvStation> = data.fuel_stations!;

package/src/lib/hms/hms.svelte.ts

@@ -4,6 +4,7 @@ import {
 	type HMSFireGeoJSON,
 	type HMSSmokeGeoJSON
 } from "@sjvair/sdk/hms";
+import type { SignalOptions } from "$lib/abort";
 import clustersDbscan from "@turf/clusters-dbscan";
 import { featureCollection, point } from "@turf/helpers";
 
@@ -22,22 +23,27 @@ class HmsManager {
 	fire: Array<HMSFireGeoJSON & { frp: number }> | undefined = $state();
 	fireGroups: Array<HMSFireGroup> | undefined = $state();
 
-	async init() {
-		await Promise.allSettled([this.loadSmoke(), this.loadFire()]);
+	async init({ signal }: SignalOptions = {}) {
+		if (signal?.aborted) throw signal.reason;
+		await Promise.allSettled([this.loadSmoke({ signal }), this.loadFire({ signal })]);
+		if (signal?.aborted) throw signal.reason;
 	}
 
-	async loadSmoke() {
-		this.smoke = await getHMSSmoke();
+	async loadSmoke({ signal }: SignalOptions = {}) {
+		if (signal?.aborted) throw signal.reason;
+		this.smoke = await getHMSSmoke({ signal });
 	}
 
-	async loadFire() {
+	async loadFire({ signal }: SignalOptions = {}) {
 		try {
-			const raw = await getHMSFire();
+			if (signal?.aborted) throw signal.reason;
+			const raw = await getHMSFire({ signal });
 			const filtered = raw.filter((d): d is HMSFireGeoJSON & { frp: number } => d.frp !== null);
 			const deduped = deduplicateByCoordinates(filtered);
 			this.fire = deduped;
 			this.fireGroups = computeFireGroups(deduped);
 		} catch (err) {
+			if (signal?.aborted) throw err;
 			console.error("HMS fire load failed:", err);
 		}
 	}

package/src/lib/index.ts

@@ -39,7 +39,7 @@ export {
 
 // State managers
 export { monitorsManager } from "./monitors/monitors.svelte";
-export type { MonitorsManager } from "./monitors/monitors.svelte";
+export type { MonitorsManager, MonitorsInitOptions } from "./monitors/monitors.svelte";
 export { collocationSitesManager } from "./collocation-sites/collocations.svelte";
 export type { CollocationSitesManager } from "./collocation-sites/collocations.svelte";
 export { evStationsManager } from "./ev-stations/ev-stations.svelte";

package/src/lib/lazy-chunks.ts

@@ -0,0 +1,7 @@
+import { sharedLoad } from "./shared-load";
+
+// The heavy chunks behind the lazy routes entry (`./lazy-routes.ts`). They are imported here,
+// not in the wrapper components that await them: sv-router treats any function whose source
+// contains `() => import(...)` as a lazy route, and a compiled component is such a function.
+export const loadMonitorMapLayout = sharedLoad(() => import("./MonitorMapLayout.svelte"));
+export const loadMonitorDetailPanel = sharedLoad(() => import("./MonitorDetailPanel.svelte"));

package/src/lib/lazy-routes.ts

@@ -1,15 +1,20 @@
 import type { Routes } from "sv-router";
+import LazyMapLayout from "./LazyMapLayout.svelte";
+import LazyMonitorDetailPanel from "./LazyMonitorDetailPanel.svelte";
+import MainMapView from "./MainMapView.svelte";
 
 /**
  * Lazy routes entry (`@sjvair/monitor-map/routes`): the same route tree as the main entry's
- * `monitorMapRoutes`, but the layout and every route load on demand, so a host router can
- * reference it at startup without loading the map.
+ * `monitorMapRoutes`, but the map layout and the monitor panel load on demand, so a host
+ * router can reference it at startup without loading the map.
  *
- * Each component must stay a literal `() => import(...)`: sv-router recognises lazy
- * components by matching the function's source text, so a helper wrapper would break it.
+ * The components here are light wrappers that load the real ones themselves
+ * (`./lazy-chunks.ts`) and show the load screen meanwhile. They are deliberately not
+ * `() => import(...)` routes: sv-router renders nothing for a route until every lazy component
+ * on it has loaded, which left the outlet empty on a cold link into the map.
  */
 export const monitorMapRoutes: Routes = {
-	layout: () => import("./MonitorMapLayout.svelte"),
-	"/": () => import("./MainMapView.svelte"),
-	"/monitor/:id": () => import("./MonitorDetailPanel.svelte")
+	layout: LazyMapLayout,
+	"/": MainMapView,
+	"/monitor/:id": LazyMonitorDetailPanel
 };

package/src/lib/map/MapShell.svelte

@@ -11,6 +11,11 @@
 		 * is true.
 		 */
 		ready: boolean;
+		/**
+		 * Rendered on the load screen, under the logo, for as long as the load screen is up.
+		 * Render it only when the caller's initial load failed (e.g. a message and a retry).
+		 */
+		loadError?: Snippet;
 		/** True when the routed detail panel (`children`) should be visible */
 		panelOpen: boolean;
 		/**
@@ -59,6 +64,7 @@
 	let {
 		integrations,
 		ready,
+		loadError,
 		panelOpen,
 		knownRoutes = [],
 		menu,
@@ -123,7 +129,7 @@
 </script>
 
 <div class="relative flex h-full w-full flex-col md:flex-row">
-	<LoadScreen />
+	<LoadScreen error={loadError} />
 	<div class="relative flex-1 overflow-hidden">
 		<Map {integrations} />
 		{@render overlays?.()}

package/src/lib/map/integrations/map-geojson-integration.svelte.ts

@@ -33,16 +33,45 @@ export abstract class MapIconLayerIntegration<
 	T = Record<string, unknown>
 > extends MapGeoJSONIntegration<T> {
 	abstract icons: MapIconManager;
+	private generation = 0;
+
+	/**
+	 * Drops every callback still waiting on icons. `apply()` and `remove()` call it, so a
+	 * subclass overriding `apply()` without calling `super.apply()` first must call it itself.
+	 */
+	protected supersedePending(): void {
+		this.generation++;
+	}
+
+	/**
+	 * Runs `run` once the icons have loaded, unless an `apply()` or `remove()` has happened
+	 * since (the state it was scheduled for is gone) or a basemap change is in flight (the
+	 * refresh on "style.load" re-applies).
+	 */
+	protected whenIconsLoad(run: () => void): void {
+		const generation = this.generation;
+		this.icons
+			.loadIcons()
+			.then(() => {
+				if (generation !== this.generation || mapManager.styleLoading) return;
+				run();
+			})
+			.catch(console.error);
+	}
 
 	apply() {
 		if (!mapManager.map) return;
 
-		this.icons.loadIcons().then(() => {
-			// A basemap change started while icons loaded; the refresh on "style.load" re-applies.
-			if (mapManager.styleLoading) return;
+		this.supersedePending();
+		this.whenIconsLoad(() => {
 			this.removeLayerAndSource();
 			mapManager.map?.addSource(this.referenceId, this.mapSource);
 			super.apply();
 		});
 	}
+
+	remove() {
+		this.supersedePending();
+		super.remove();
+	}
 }