@sjvair/monitor-map 3.3.0 → 3.3.1

package/dist/lib/MonitorMapLayout.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Snippet } from "svelte";
-	import { onDestroy } from "svelte";
+	import { onDestroy, untrack } from "svelte";
 	import MapShell from "./map/MapShell.svelte";
 	import MonitorsDisplayOptions from "./monitors/components/MonitorsDisplayOptions.svelte";
 	import MapLayersDisplayOptions from "./components/MapLayersDisplayOptions.svelte";
@@ -54,10 +54,15 @@
 	// applies a later "?pollutant=" change (e.g. navigating in from elsewhere) to an already-running manager.
 	$effect(() => {
 		const urlPollutant = route.search.pollutant;
+		// Read monitorsManager.pollutant via untrack: this effect must only react to the URL
+		// changing (e.g. navigating in from elsewhere), not to monitorsManager.pollutant itself.
+		// Tracking it here would make a UI-driven pollutant change (e.g. the display-options
+		// toggle) re-trigger this effect before the manager->URL effect below can sync the URL,
+		// so this effect would see the still-stale URL and immediately revert the user's change.
 		if (
 			monitorsManager.initialized &&
 			(urlPollutant === "pm25" || urlPollutant === "o3") &&
-			monitorsManager.pollutant !== urlPollutant
+			untrack(() => monitorsManager.pollutant) !== urlPollutant
 		) {
 			monitorsManager.pollutant = urlPollutant;
 		}

package/dist/lib/map/MapShell.svelte

@@ -70,8 +70,12 @@
 	const TRANSITION_MS = 300;
 
 	$effect(() => {
+		// mapManager.map is only ever assigned once its own initial "load" has
+		// already fired (see initializeMap in map.svelte.ts), so by the time this
+		// effect sees a non-null map, it's already safe to reveal — waiting for a
+		// further "idle" event here is unreliable since one may never fire again.
 		if (mapManager.map && ready) {
-			mapManager.map.once("idle", () => disableLoadScreen());
+			disableLoadScreen();
 		}
 	});
 

package/dist/lib/map/map.svelte.js

@@ -42,7 +42,7 @@ export const initializeMap = (container) => {
             preset: "milkyway"
         }
     });
-    map.once("idle", () => {
+    map.once("load", () => {
         mapManager.map = map;
     });
     return () => map.remove();

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sjvair/monitor-map",
 	"description": "SJVAir's interactive monitor map",
-	"version": "3.3.0",
+	"version": "3.3.1",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/SJVAir/monitor-map"

package/src/lib/MonitorMapLayout.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { Snippet } from "svelte";
-	import { onDestroy } from "svelte";
+	import { onDestroy, untrack } from "svelte";
 	import MapShell from "$lib/map/MapShell.svelte";
 	import MonitorsDisplayOptions from "$lib/monitors/components/MonitorsDisplayOptions.svelte";
 	import MapLayersDisplayOptions from "$lib/components/MapLayersDisplayOptions.svelte";
@@ -54,10 +54,15 @@
 	// applies a later "?pollutant=" change (e.g. navigating in from elsewhere) to an already-running manager.
 	$effect(() => {
 		const urlPollutant = route.search.pollutant;
+		// Read monitorsManager.pollutant via untrack: this effect must only react to the URL
+		// changing (e.g. navigating in from elsewhere), not to monitorsManager.pollutant itself.
+		// Tracking it here would make a UI-driven pollutant change (e.g. the display-options
+		// toggle) re-trigger this effect before the manager->URL effect below can sync the URL,
+		// so this effect would see the still-stale URL and immediately revert the user's change.
 		if (
 			monitorsManager.initialized &&
 			(urlPollutant === "pm25" || urlPollutant === "o3") &&
-			monitorsManager.pollutant !== urlPollutant
+			untrack(() => monitorsManager.pollutant) !== urlPollutant
 		) {
 			monitorsManager.pollutant = urlPollutant;
 		}

package/src/lib/map/MapShell.svelte

@@ -70,8 +70,12 @@
 	const TRANSITION_MS = 300;
 
 	$effect(() => {
+		// mapManager.map is only ever assigned once its own initial "load" has
+		// already fired (see initializeMap in map.svelte.ts), so by the time this
+		// effect sees a non-null map, it's already safe to reveal — waiting for a
+		// further "idle" event here is unreliable since one may never fire again.
 		if (mapManager.map && ready) {
-			mapManager.map.once("idle", () => disableLoadScreen());
+			disableLoadScreen();
 		}
 	});
 

package/src/lib/map/map.svelte.ts

@@ -61,7 +61,7 @@ export const initializeMap: Attachment<HTMLDivElement> = (container: string | HT
 		}
 	});
 
-	map.once("idle", () => {
+	map.once("load", () => {
 		mapManager.map = map;
 	});