@aguacerowx/mapsgl 0.0.56 → 0.0.58

package/src/nexrad/level3StormRelative.ts

@@ -1,116 +1,116 @@
-import type { DecodedRadarFrame } from './nexradArchiveCache.js';
-
-/**
- * Storm motion from N0S (ICD 56) product description dep8/dep9, same as AtticRadar
- * (loaders_nexrad.js process_storm_relative_velocity).
- * dep8: storm speed in tenths of knots; dep9: direction in tenths of degrees.
- */
-export function parseLevel3StormMotionFromBuffer(buffer: ArrayBuffer): { speedMs: number; directionDeg: number } | null {
-    const bytes = new Uint8Array(buffer);
-    const marker = [83, 68, 85, 83];
-    let start = 0;
-    for (let i = 0; i <= bytes.length - 4; i++) {
-        if (bytes[i] === marker[0] && bytes[i + 1] === marker[1] && bytes[i + 2] === marker[2] && bytes[i + 3] === marker[3]) {
-            start = i;
-            break;
-        }
-    }
-    const dv = new DataView(buffer, start, bytes.length - start);
-    const textLen = 30;
-    const msgHdrLen = 18;
-    const pdbStart = textLen + msgHdrLen;
-    if (pdbStart + 86 > dv.byteLength) return null;
-    if (dv.getInt16(pdbStart, false) !== -1) return null;
-    const dep8Offset = pdbStart + 82;
-    const dep8 = dv.getInt16(dep8Offset, false);
-    const dep9 = dv.getInt16(dep8Offset + 2, false);
-    const stormSpeedKt = dep8 / 10;
-    const speedMs = stormSpeedKt * 0.514444;
-    const directionDeg = dep9 / 10;
-    if (!Number.isFinite(speedMs) || !Number.isFinite(directionDeg)) return null;
-    return { speedMs, directionDeg };
-}
-
-/** AtticRadar calculateStormComponent — radial component of storm motion (m/s). */
-export function level3StormRadialComponentMs(stormSpeedMs: number, stormDirectionDeg: number, azimuthDeg: number): number {
-    const stormDirRad = (stormDirectionDeg * Math.PI) / 180;
-    const azRad = (azimuthDeg * Math.PI) / 180;
-    return stormSpeedMs * Math.cos(stormDirRad - azRad);
-}
-
-function decodeGateRawMs(hi: number, lo: number, valueScale: number, valueOffset: number): number | null {
-    const raw = lo + hi * 256;
-    let signed = raw;
-    if (raw >= 32768) signed = raw - 65536;
-    if (signed <= -32768) return null;
-    return signed * valueScale + valueOffset;
-}
-
-function encodeGateRawMs(physicalMs: number, valueScale: number, valueOffset: number): [number, number] {
-    const raw = Math.round((physicalMs - valueOffset) / valueScale);
-    const signed = Math.max(-32768, Math.min(32767, raw));
-    const u = signed < 0 ? signed + 65536 : signed;
-    return [(u >> 8) & 0xff, u & 0xff];
-}
-
-/**
- * Apply storm-relative correction to super-res base velocity (N0G): v_srv = v + storm_radial_component.
- * Matches AtticRadar process_storm_relative_velocity / PR #12.
- */
-export function applyLevel3StormRelativeToFrame(
-    frame: DecodedRadarFrame,
-    stormSpeedMs: number,
-    stormDirectionDeg: number,
-): DecodedRadarFrame {
-    const { nRays, nGates, gateData, rayBoundariesDeg, valueScale, valueOffset } = frame;
-    const out = new Uint8Array(gateData.length);
-    for (let r = 0; r < nRays; r++) {
-        const azLow = rayBoundariesDeg[r];
-        const azHigh = rayBoundariesDeg[r + 1];
-        const azimuthDeg = (Number(azLow) + Number(azHigh)) * 0.5;
-        const stormComp = level3StormRadialComponentMs(stormSpeedMs, stormDirectionDeg, azimuthDeg);
-        for (let g = 0; g < nGates; g++) {
-            const o = (r * nGates + g) * 2;
-            const hi = gateData[o];
-            const lo = gateData[o + 1];
-            const v = decodeGateRawMs(hi, lo, valueScale, valueOffset);
-            if (v == null) {
-                out[o] = hi;
-                out[o + 1] = lo;
-                continue;
-            }
-            const corrected = v + stormComp;
-            const [nh, nl] = encodeGateRawMs(corrected, valueScale, valueOffset);
-            out[o] = nh;
-            out[o + 1] = nl;
-        }
-    }
-    return { ...frame, gateData: out };
-}
-
-export function pickNearestLevel3ObjectKey(
-    unixTime: number,
-    timeToKeyMap: Record<string, string>,
-    maxDeltaSec = 600,
-): string | null {
-    const direct = timeToKeyMap[String(unixTime)];
-    if (direct) return direct;
-    const entries = Object.entries(timeToKeyMap);
-    if (entries.length === 0) return null;
-    let bestKey: string | null = null;
-    let bestDelta = Infinity;
-    for (const [tStr, key] of entries) {
-        const t = Number(tStr);
-        if (!Number.isFinite(t)) continue;
-        const d = Math.abs(t - unixTime);
-        if (d < bestDelta) {
-            bestDelta = d;
-            bestKey = key;
-        }
-    }
-    if (bestKey == null) return null;
-    if (bestDelta > maxDeltaSec && Number.isFinite(maxDeltaSec)) {
-        return null;
-    }
-    return bestKey;
-}
+import type { DecodedRadarFrame } from './nexradArchiveCache.js';
+
+/**
+ * Storm motion from N0S (ICD 56) product description dep8/dep9, same as AtticRadar
+ * (loaders_nexrad.js process_storm_relative_velocity).
+ * dep8: storm speed in tenths of knots; dep9: direction in tenths of degrees.
+ */
+export function parseLevel3StormMotionFromBuffer(buffer: ArrayBuffer): { speedMs: number; directionDeg: number } | null {
+    const bytes = new Uint8Array(buffer);
+    const marker = [83, 68, 85, 83];
+    let start = 0;
+    for (let i = 0; i <= bytes.length - 4; i++) {
+        if (bytes[i] === marker[0] && bytes[i + 1] === marker[1] && bytes[i + 2] === marker[2] && bytes[i + 3] === marker[3]) {
+            start = i;
+            break;
+        }
+    }
+    const dv = new DataView(buffer, start, bytes.length - start);
+    const textLen = 30;
+    const msgHdrLen = 18;
+    const pdbStart = textLen + msgHdrLen;
+    if (pdbStart + 86 > dv.byteLength) return null;
+    if (dv.getInt16(pdbStart, false) !== -1) return null;
+    const dep8Offset = pdbStart + 82;
+    const dep8 = dv.getInt16(dep8Offset, false);
+    const dep9 = dv.getInt16(dep8Offset + 2, false);
+    const stormSpeedKt = dep8 / 10;
+    const speedMs = stormSpeedKt * 0.514444;
+    const directionDeg = dep9 / 10;
+    if (!Number.isFinite(speedMs) || !Number.isFinite(directionDeg)) return null;
+    return { speedMs, directionDeg };
+}
+
+/** AtticRadar calculateStormComponent — radial component of storm motion (m/s). */
+export function level3StormRadialComponentMs(stormSpeedMs: number, stormDirectionDeg: number, azimuthDeg: number): number {
+    const stormDirRad = (stormDirectionDeg * Math.PI) / 180;
+    const azRad = (azimuthDeg * Math.PI) / 180;
+    return stormSpeedMs * Math.cos(stormDirRad - azRad);
+}
+
+function decodeGateRawMs(hi: number, lo: number, valueScale: number, valueOffset: number): number | null {
+    const raw = lo + hi * 256;
+    let signed = raw;
+    if (raw >= 32768) signed = raw - 65536;
+    if (signed <= -32768) return null;
+    return signed * valueScale + valueOffset;
+}
+
+function encodeGateRawMs(physicalMs: number, valueScale: number, valueOffset: number): [number, number] {
+    const raw = Math.round((physicalMs - valueOffset) / valueScale);
+    const signed = Math.max(-32768, Math.min(32767, raw));
+    const u = signed < 0 ? signed + 65536 : signed;
+    return [(u >> 8) & 0xff, u & 0xff];
+}
+
+/**
+ * Apply storm-relative correction to super-res base velocity (N0G): v_srv = v + storm_radial_component.
+ * Matches AtticRadar process_storm_relative_velocity / PR #12.
+ */
+export function applyLevel3StormRelativeToFrame(
+    frame: DecodedRadarFrame,
+    stormSpeedMs: number,
+    stormDirectionDeg: number,
+): DecodedRadarFrame {
+    const { nRays, nGates, gateData, rayBoundariesDeg, valueScale, valueOffset } = frame;
+    const out = new Uint8Array(gateData.length);
+    for (let r = 0; r < nRays; r++) {
+        const azLow = rayBoundariesDeg[r];
+        const azHigh = rayBoundariesDeg[r + 1];
+        const azimuthDeg = (Number(azLow) + Number(azHigh)) * 0.5;
+        const stormComp = level3StormRadialComponentMs(stormSpeedMs, stormDirectionDeg, azimuthDeg);
+        for (let g = 0; g < nGates; g++) {
+            const o = (r * nGates + g) * 2;
+            const hi = gateData[o];
+            const lo = gateData[o + 1];
+            const v = decodeGateRawMs(hi, lo, valueScale, valueOffset);
+            if (v == null) {
+                out[o] = hi;
+                out[o + 1] = lo;
+                continue;
+            }
+            const corrected = v + stormComp;
+            const [nh, nl] = encodeGateRawMs(corrected, valueScale, valueOffset);
+            out[o] = nh;
+            out[o + 1] = nl;
+        }
+    }
+    return { ...frame, gateData: out };
+}
+
+export function pickNearestLevel3ObjectKey(
+    unixTime: number,
+    timeToKeyMap: Record<string, string>,
+    maxDeltaSec = 600,
+): string | null {
+    const direct = timeToKeyMap[String(unixTime)];
+    if (direct) return direct;
+    const entries = Object.entries(timeToKeyMap);
+    if (entries.length === 0) return null;
+    let bestKey: string | null = null;
+    let bestDelta = Infinity;
+    for (const [tStr, key] of entries) {
+        const t = Number(tStr);
+        if (!Number.isFinite(t)) continue;
+        const d = Math.abs(t - unixTime);
+        if (d < bestDelta) {
+            bestDelta = d;
+            bestKey = key;
+        }
+    }
+    if (bestKey == null) return null;
+    if (bestDelta > maxDeltaSec && Number.isFinite(maxDeltaSec)) {
+        return null;
+    }
+    return bestKey;
+}

package/src/nexrad/loadNexradSites.ts

@@ -1,119 +1,119 @@
-import type { NexradSite } from './PreprocessedSweepParser.js';
-import nexradSitesDefault from './nexradSitesDefault.json';
-import { nexradArchiveDiag, redactApiKeyFromUrl } from './nexradArchiveDiag.js';
-
-type NexradSitesPayload = {
-    sites?: NexradSite[];
-    features?: unknown[];
-} | NexradSite[];
-
-/** Default: same as aguacero-frontend — app serves `public/data/nexrad.json` at `/data/nexrad.json`. */
-let sitesUrl = '/data/nexrad.json';
-
-/** Override default nexrad.json URL if your static path differs. */
-export function setNexradSitesJsonUrl(url: string) {
-    sitesUrl = url || sitesUrl;
-}
-
-/**
- * When sitesUrl is HTTPS (e.g. CloudFront), use the same auth as AguaceroCore grid fetches:
- * `?apiKey=`, `x-api-key`, and `x-app-identifier` on React Native when bundle id is set.
- */
-let SITES_FETCH_API_KEY = '';
-let SITES_FETCH_BUNDLE_ID = '';
-export function setNexradSitesFetchAuth(apiKey: string, bundleId?: string) {
-    SITES_FETCH_API_KEY = apiKey || '';
-    if (bundleId !== undefined) {
-        SITES_FETCH_BUNDLE_ID = bundleId || '';
-    }
-}
-
-let nexradSitesPayloadPromise: Promise<NexradSitesPayload> | null = null;
-
-function sitesFetchUrl(): string {
-    if (!sitesUrl.startsWith('http') || !SITES_FETCH_API_KEY) {
-        return sitesUrl;
-    }
-    const sep = sitesUrl.includes('?') ? '&' : '?';
-    return `${sitesUrl}${sep}apiKey=${SITES_FETCH_API_KEY}`;
-}
-
-function sitesFetchHeaders(): Record<string, string> | undefined {
-    if (!SITES_FETCH_API_KEY) {
-        return undefined;
-    }
-    const headers: Record<string, string> = {
-        'x-api-key': SITES_FETCH_API_KEY,
-    };
-    const nav = (globalThis as { navigator?: { product?: string } }).navigator;
-    if (nav?.product === 'ReactNative' && SITES_FETCH_BUNDLE_ID) {
-        headers['x-app-identifier'] = SITES_FETCH_BUNDLE_ID;
-    }
-    return headers;
-}
-
-function embeddedSitesPayload(): NexradSitesPayload {
-    return nexradSitesDefault as NexradSitesPayload;
-}
-
-export function loadNexradSitesPayload(): Promise<NexradSitesPayload> {
-    if (nexradSitesPayloadPromise) {
-        return nexradSitesPayloadPromise;
-    }
-    nexradSitesPayloadPromise = (async (): Promise<NexradSitesPayload> => {
-        const url = sitesFetchUrl();
-        const headers = sitesFetchHeaders();
-        const headerKeys = headers ? Object.keys(headers).join(',') : '';
-        nexradArchiveDiag('sites.fetch.start', {
-            canonicalUrl: sitesUrl,
-            fetchUrl: redactApiKeyFromUrl(url),
-            hasApiKeyQuery: url.includes('apiKey='),
-            headerKeys: headerKeys || '(none)',
-            apiKeyLen: SITES_FETCH_API_KEY.length,
-            bundleIdLen: SITES_FETCH_BUNDLE_ID.length,
-        });
-        try {
-            const response = await fetch(url, headers ? { headers } : undefined);
-            if (response.ok) {
-                nexradArchiveDiag('sites.fetch.ok', {
-                    status: response.status,
-                    canonicalUrl: sitesUrl,
-                });
-                return (await response.json()) as NexradSitesPayload;
-            }
-            if (sitesUrl.startsWith('https://')) {
-                console.warn(
-                    `[mapsgl] nexrad.json HTTP ${response.status} for ${sitesUrl} — using embedded site list`,
-                );
-                nexradArchiveDiag('sites.fetch.fallbackEmbedded', {
-                    httpStatus: response.status,
-                    reason: 'HTTPS non-OK — CloudFront may not host /data/nexrad.json; embedded list used',
-                    canonicalUrl: sitesUrl,
-                });
-                return embeddedSitesPayload();
-            }
-            throw new Error(`nexrad.json fetch failed: HTTP ${response.status}`);
-        } catch (error) {
-            if (sitesUrl.startsWith('https://')) {
-                console.warn('[mapsgl] nexrad.json load failed — using embedded site list:', error);
-                nexradArchiveDiag('sites.fetch.catchFallbackEmbedded', {
-                    message: error instanceof Error ? error.message : String(error),
-                    canonicalUrl: sitesUrl,
-                });
-                return embeddedSitesPayload();
-            }
-            console.error('[mapsgl] Could not load nexrad.json:', error);
-            nexradSitesPayloadPromise = null;
-            throw error;
-        }
-    })();
-    return nexradSitesPayloadPromise;
-}
-
-export async function loadNexradSites(): Promise<NexradSite[]> {
-    const payload = await loadNexradSitesPayload();
-    if (Array.isArray(payload)) return payload as NexradSite[];
-    const sites = (payload as { sites?: NexradSite[] }).sites;
-    if (sites && Array.isArray(sites)) return sites;
-    return [];
-}
+import type { NexradSite } from './PreprocessedSweepParser.js';
+import nexradSitesDefault from './nexradSitesDefault.json';
+import { nexradArchiveDiag, redactApiKeyFromUrl } from './nexradArchiveDiag.js';
+
+type NexradSitesPayload = {
+    sites?: NexradSite[];
+    features?: unknown[];
+} | NexradSite[];
+
+/** Default: same as aguacero-frontend — app serves `public/data/nexrad.json` at `/data/nexrad.json`. */
+let sitesUrl = '/data/nexrad.json';
+
+/** Override default nexrad.json URL if your static path differs. */
+export function setNexradSitesJsonUrl(url: string) {
+    sitesUrl = url || sitesUrl;
+}
+
+/**
+ * When sitesUrl is HTTPS (e.g. CloudFront), use the same auth as AguaceroCore grid fetches:
+ * `?apiKey=`, `x-api-key`, and `x-app-identifier` on React Native when bundle id is set.
+ */
+let SITES_FETCH_API_KEY = '';
+let SITES_FETCH_BUNDLE_ID = '';
+export function setNexradSitesFetchAuth(apiKey: string, bundleId?: string) {
+    SITES_FETCH_API_KEY = apiKey || '';
+    if (bundleId !== undefined) {
+        SITES_FETCH_BUNDLE_ID = bundleId || '';
+    }
+}
+
+let nexradSitesPayloadPromise: Promise<NexradSitesPayload> | null = null;
+
+function sitesFetchUrl(): string {
+    if (!sitesUrl.startsWith('http') || !SITES_FETCH_API_KEY) {
+        return sitesUrl;
+    }
+    const sep = sitesUrl.includes('?') ? '&' : '?';
+    return `${sitesUrl}${sep}apiKey=${SITES_FETCH_API_KEY}`;
+}
+
+function sitesFetchHeaders(): Record<string, string> | undefined {
+    if (!SITES_FETCH_API_KEY) {
+        return undefined;
+    }
+    const headers: Record<string, string> = {
+        'x-api-key': SITES_FETCH_API_KEY,
+    };
+    const nav = (globalThis as { navigator?: { product?: string } }).navigator;
+    if (nav?.product === 'ReactNative' && SITES_FETCH_BUNDLE_ID) {
+        headers['x-app-identifier'] = SITES_FETCH_BUNDLE_ID;
+    }
+    return headers;
+}
+
+function embeddedSitesPayload(): NexradSitesPayload {
+    return nexradSitesDefault as NexradSitesPayload;
+}
+
+export function loadNexradSitesPayload(): Promise<NexradSitesPayload> {
+    if (nexradSitesPayloadPromise) {
+        return nexradSitesPayloadPromise;
+    }
+    nexradSitesPayloadPromise = (async (): Promise<NexradSitesPayload> => {
+        const url = sitesFetchUrl();
+        const headers = sitesFetchHeaders();
+        const headerKeys = headers ? Object.keys(headers).join(',') : '';
+        nexradArchiveDiag('sites.fetch.start', {
+            canonicalUrl: sitesUrl,
+            fetchUrl: redactApiKeyFromUrl(url),
+            hasApiKeyQuery: url.includes('apiKey='),
+            headerKeys: headerKeys || '(none)',
+            apiKeyLen: SITES_FETCH_API_KEY.length,
+            bundleIdLen: SITES_FETCH_BUNDLE_ID.length,
+        });
+        try {
+            const response = await fetch(url, headers ? { headers } : undefined);
+            if (response.ok) {
+                nexradArchiveDiag('sites.fetch.ok', {
+                    status: response.status,
+                    canonicalUrl: sitesUrl,
+                });
+                return (await response.json()) as NexradSitesPayload;
+            }
+            if (sitesUrl.startsWith('https://')) {
+                console.warn(
+                    `[mapsgl] nexrad.json HTTP ${response.status} for ${sitesUrl} — using embedded site list`,
+                );
+                nexradArchiveDiag('sites.fetch.fallbackEmbedded', {
+                    httpStatus: response.status,
+                    reason: 'HTTPS non-OK — CloudFront may not host /data/nexrad.json; embedded list used',
+                    canonicalUrl: sitesUrl,
+                });
+                return embeddedSitesPayload();
+            }
+            throw new Error(`nexrad.json fetch failed: HTTP ${response.status}`);
+        } catch (error) {
+            if (sitesUrl.startsWith('https://')) {
+                console.warn('[mapsgl] nexrad.json load failed — using embedded site list:', error);
+                nexradArchiveDiag('sites.fetch.catchFallbackEmbedded', {
+                    message: error instanceof Error ? error.message : String(error),
+                    canonicalUrl: sitesUrl,
+                });
+                return embeddedSitesPayload();
+            }
+            console.error('[mapsgl] Could not load nexrad.json:', error);
+            nexradSitesPayloadPromise = null;
+            throw error;
+        }
+    })();
+    return nexradSitesPayloadPromise;
+}
+
+export async function loadNexradSites(): Promise<NexradSite[]> {
+    const payload = await loadNexradSitesPayload();
+    if (Array.isArray(payload)) return payload as NexradSite[];
+    const sites = (payload as { sites?: NexradSite[] }).sites;
+    if (sites && Array.isArray(sites)) return sites;
+    return [];
+}

package/src/nexrad/nexradArchiveDiag.ts

@@ -1,26 +1,26 @@
-/**
- * Verbose NEXRAD archive pipeline logs for React Native (Hermes / Logcat).
- * Filter: {@code [Aguacero][NEXRAD][archive]}
- *
- * Omits raw API keys; use lengths / booleans only.
- */
-export type NexradArchiveDiagDetail = Record<string, string | number | boolean | null | undefined>;
-
-export function redactApiKeyFromUrl(u: string): string {
-    return u.replace(/([?&])apiKey=[^&]*/gi, '$1apiKey=(redacted)');
-}
-
-function isReactNative(): boolean {
-    const nav = (globalThis as { navigator?: { product?: string } }).navigator;
-    return nav?.product === 'ReactNative';
-}
-
-/** Logs only on React Native to avoid noisy web consoles (mapsgl path is already observable in DevTools). */
-export function nexradArchiveDiag(phase: string, detail?: NexradArchiveDiagDetail): void {
-    if (!isReactNative()) return;
-    if (detail !== undefined) {
-        console.warn(`[Aguacero][NEXRAD][archive] ${phase}`, detail);
-    } else {
-        console.warn(`[Aguacero][NEXRAD][archive] ${phase}`);
-    }
-}
+/**
+ * Verbose NEXRAD archive pipeline logs for React Native (Hermes / Logcat).
+ * Filter: {@code [Aguacero][NEXRAD][archive]}
+ *
+ * Omits raw API keys; use lengths / booleans only.
+ */
+export type NexradArchiveDiagDetail = Record<string, string | number | boolean | null | undefined>;
+
+export function redactApiKeyFromUrl(u: string): string {
+    return u.replace(/([?&])apiKey=[^&]*/gi, '$1apiKey=(redacted)');
+}
+
+function isReactNative(): boolean {
+    const nav = (globalThis as { navigator?: { product?: string } }).navigator;
+    return nav?.product === 'ReactNative';
+}
+
+/** Logs only on React Native to avoid noisy web consoles (mapsgl path is already observable in DevTools). */
+export function nexradArchiveDiag(phase: string, detail?: NexradArchiveDiagDetail): void {
+    if (!isReactNative()) return;
+    if (detail !== undefined) {
+        console.warn(`[Aguacero][NEXRAD][archive] ${phase}`, detail);
+    } else {
+        console.warn(`[Aguacero][NEXRAD][archive] ${phase}`);
+    }
+}