@aguacerowx/mapsgl 0.0.57 → 0.0.58

package/src/NexradSitesOverlay.js

@@ -1,148 +1,148 @@
-/**
- * GeoJSON markers for all NEXRAD sites (picker mode). Aligned with aguacero-frontend NexradSitesLayer (simplified).
- */
-const SOURCE_ID = 'aguacero-nexrad-sites-src';
-const CIRCLE_LAYER_ID = 'aguacero-nexrad-sites-circles';
-
-export class NexradSitesOverlay {
-    constructor(map, options = {}) {
-        this.map = map;
-        /** Same path as aguacero-frontend: serve `public/data/nexrad.json` (e.g. Vite → `/data/nexrad.json`). */
-        this.sitesUrl = options.nexradSitesUrl || '/data/nexrad.json';
-        this._onClick = null;
-        /** Coalesces overlapping `show()` calls (e.g. NEXRAD timestamp slider firing many state updates). */
-        this._showPromise = null;
-        this._destroyed = false;
-    }
-
-    _layersPresent() {
-        try {
-            return Boolean(this.map.getSource(SOURCE_ID) && this.map.getLayer(CIRCLE_LAYER_ID));
-        } catch {
-            return false;
-        }
-    }
-
-    async show() {
-        if (this._layersPresent()) {
-            return;
-        }
-        if (this._showPromise) {
-            return this._showPromise;
-        }
-
-        this._showPromise = this._loadAndMountSites();
-        try {
-            await this._showPromise;
-        } finally {
-            this._showPromise = null;
-        }
-    }
-
-    async _loadAndMountSites() {
-        if (this._layersPresent()) {
-            return;
-        }
-        await this.hide();
-        let res;
-        try {
-            res = await fetch(this.sitesUrl);
-        } catch (e) {
-            console.warn('[NexradSitesOverlay] Failed to load site list:', e);
-            return;
-        }
-        if (!res.ok) {
-            console.warn('[NexradSitesOverlay] HTTP', res.status, this.sitesUrl);
-            return;
-        }
-        if (this._destroyed) {
-            return;
-        }
-        const payload = await res.json();
-        const raw = Array.isArray(payload)
-            ? payload
-            : payload?.features
-              ? payload.features
-              : payload?.sites
-                ? payload.sites
-                : [];
-        const features = [];
-        for (const item of raw) {
-            if (!item) continue;
-            const coords = item.geometry?.coordinates
-                ? item.geometry.coordinates
-                : [item.lon ?? item.lng ?? item.longitude, item.lat ?? item.latitude];
-            const lon = Number(coords[0]);
-            const lat = Number(coords[1]);
-            const id = String(item.id ?? item.properties?.id ?? item.station ?? '').toUpperCase();
-            if (!id || !Number.isFinite(lat) || !Number.isFinite(lon)) continue;
-            features.push({
-                type: 'Feature',
-                geometry: { type: 'Point', coordinates: [lon, lat] },
-                properties: { name: id },
-            });
-        }
-        if (this._destroyed) {
-            return;
-        }
-        this.map.addSource(SOURCE_ID, {
-            type: 'geojson',
-            data: { type: 'FeatureCollection', features },
-        });
-        this.map.addLayer({
-            id: CIRCLE_LAYER_ID,
-            type: 'circle',
-            source: SOURCE_ID,
-            paint: {
-                'circle-radius': 5,
-                'circle-color': '#3b82f6',
-                'circle-stroke-width': 1,
-                'circle-stroke-color': '#ffffff',
-            },
-        });
-    }
-
-    hide() {
-        try {
-            if (this.map.getLayer(CIRCLE_LAYER_ID)) this.map.removeLayer(CIRCLE_LAYER_ID);
-            if (this.map.getSource(SOURCE_ID)) this.map.removeSource(SOURCE_ID);
-        } catch {
-            /* ignore */
-        }
-    }
-
-    /**
-     * @param {(siteId: string) => void} handler
-     */
-    bindClick(handler) {
-        this.unbindClick();
-        this._onClick = (e) => {
-            const f = e.features?.[0];
-            const id = f?.properties?.name;
-            if (id) handler(String(id));
-        };
-        this.map.on('click', CIRCLE_LAYER_ID, this._onClick);
-        this.map.on('mouseenter', CIRCLE_LAYER_ID, () => {
-            this.map.getCanvas().style.cursor = 'pointer';
-        });
-        this.map.on('mouseleave', CIRCLE_LAYER_ID, () => {
-            this.map.getCanvas().style.cursor = '';
-        });
-    }
-
-    unbindClick() {
-        if (!this._onClick) return;
-        try {
-            this.map.off('click', CIRCLE_LAYER_ID, this._onClick);
-        } catch {
-            /* ignore */
-        }
-        this._onClick = null;
-    }
-
-    destroy() {
-        this._destroyed = true;
-        this.unbindClick();
-        this.hide();
-    }
-}
+/**
+ * GeoJSON markers for all NEXRAD sites (picker mode). Aligned with aguacero-frontend NexradSitesLayer (simplified).
+ */
+const SOURCE_ID = 'aguacero-nexrad-sites-src';
+const CIRCLE_LAYER_ID = 'aguacero-nexrad-sites-circles';
+
+export class NexradSitesOverlay {
+    constructor(map, options = {}) {
+        this.map = map;
+        /** Same path as aguacero-frontend: serve `public/data/nexrad.json` (e.g. Vite → `/data/nexrad.json`). */
+        this.sitesUrl = options.nexradSitesUrl || '/data/nexrad.json';
+        this._onClick = null;
+        /** Coalesces overlapping `show()` calls (e.g. NEXRAD timestamp slider firing many state updates). */
+        this._showPromise = null;
+        this._destroyed = false;
+    }
+
+    _layersPresent() {
+        try {
+            return Boolean(this.map.getSource(SOURCE_ID) && this.map.getLayer(CIRCLE_LAYER_ID));
+        } catch {
+            return false;
+        }
+    }
+
+    async show() {
+        if (this._layersPresent()) {
+            return;
+        }
+        if (this._showPromise) {
+            return this._showPromise;
+        }
+
+        this._showPromise = this._loadAndMountSites();
+        try {
+            await this._showPromise;
+        } finally {
+            this._showPromise = null;
+        }
+    }
+
+    async _loadAndMountSites() {
+        if (this._layersPresent()) {
+            return;
+        }
+        await this.hide();
+        let res;
+        try {
+            res = await fetch(this.sitesUrl);
+        } catch (e) {
+            console.warn('[NexradSitesOverlay] Failed to load site list:', e);
+            return;
+        }
+        if (!res.ok) {
+            console.warn('[NexradSitesOverlay] HTTP', res.status, this.sitesUrl);
+            return;
+        }
+        if (this._destroyed) {
+            return;
+        }
+        const payload = await res.json();
+        const raw = Array.isArray(payload)
+            ? payload
+            : payload?.features
+              ? payload.features
+              : payload?.sites
+                ? payload.sites
+                : [];
+        const features = [];
+        for (const item of raw) {
+            if (!item) continue;
+            const coords = item.geometry?.coordinates
+                ? item.geometry.coordinates
+                : [item.lon ?? item.lng ?? item.longitude, item.lat ?? item.latitude];
+            const lon = Number(coords[0]);
+            const lat = Number(coords[1]);
+            const id = String(item.id ?? item.properties?.id ?? item.station ?? '').toUpperCase();
+            if (!id || !Number.isFinite(lat) || !Number.isFinite(lon)) continue;
+            features.push({
+                type: 'Feature',
+                geometry: { type: 'Point', coordinates: [lon, lat] },
+                properties: { name: id },
+            });
+        }
+        if (this._destroyed) {
+            return;
+        }
+        this.map.addSource(SOURCE_ID, {
+            type: 'geojson',
+            data: { type: 'FeatureCollection', features },
+        });
+        this.map.addLayer({
+            id: CIRCLE_LAYER_ID,
+            type: 'circle',
+            source: SOURCE_ID,
+            paint: {
+                'circle-radius': 5,
+                'circle-color': '#3b82f6',
+                'circle-stroke-width': 1,
+                'circle-stroke-color': '#ffffff',
+            },
+        });
+    }
+
+    hide() {
+        try {
+            if (this.map.getLayer(CIRCLE_LAYER_ID)) this.map.removeLayer(CIRCLE_LAYER_ID);
+            if (this.map.getSource(SOURCE_ID)) this.map.removeSource(SOURCE_ID);
+        } catch {
+            /* ignore */
+        }
+    }
+
+    /**
+     * @param {(siteId: string) => void} handler
+     */
+    bindClick(handler) {
+        this.unbindClick();
+        this._onClick = (e) => {
+            const f = e.features?.[0];
+            const id = f?.properties?.name;
+            if (id) handler(String(id));
+        };
+        this.map.on('click', CIRCLE_LAYER_ID, this._onClick);
+        this.map.on('mouseenter', CIRCLE_LAYER_ID, () => {
+            this.map.getCanvas().style.cursor = 'pointer';
+        });
+        this.map.on('mouseleave', CIRCLE_LAYER_ID, () => {
+            this.map.getCanvas().style.cursor = '';
+        });
+    }
+
+    unbindClick() {
+        if (!this._onClick) return;
+        try {
+            this.map.off('click', CIRCLE_LAYER_ID, this._onClick);
+        } catch {
+            /* ignore */
+        }
+        this._onClick = null;
+    }
+
+    destroy() {
+        this._destroyed = true;
+        this.unbindClick();
+        this.hide();
+    }
+}

package/src/NexradWeatherController.js

@@ -8,6 +8,7 @@ import {
     objectKeyToUrl,
     setNexradArchiveApiKey,
     setNexradArchiveBundleId,
+    setNexradArchiveSiteOrigin,
     setNexradSitesFetchAuth,
 } from './nexrad/radarArchiveCore.bundled.js';
 import { MapboxRadarLayer } from './nexrad/MapboxRadarLayer.bundled.js';
@@ -275,6 +276,7 @@ export class NexradWeatherController {
 
         setNexradArchiveApiKey(this.core.apiKey || '');
         setNexradArchiveBundleId(this.core.bundleId || '');
+        setNexradArchiveSiteOrigin(this.core.gridRequestSiteOrigin || '');
         setNexradSitesFetchAuth(this.core.apiKey || '', this.core.bundleId || '');
 
         const times = [...(state.availableNexradTimestamps || [])]
@@ -362,6 +364,7 @@ export class NexradWeatherController {
 
         setNexradArchiveApiKey(this.core.apiKey || '');
         setNexradArchiveBundleId(this.core.bundleId || '');
+        setNexradArchiveSiteOrigin(this.core.gridRequestSiteOrigin || '');
         setNexradSitesFetchAuth(this.core.apiKey || '', this.core.bundleId || '');
 
         const unix = Number(state.nexradTimestamp);