@aguacerowx/javascript-sdk 0.0.28 → 0.0.29

package/src/nexradTiltCoalesce.js

@@ -1,95 +1,95 @@
-/**
- * NEXRAD tilt coalescing (matches aguacero-frontend `nexradTiltCoalesce.ts`).
- * Adjacent manifest tilts within {@link NEXRAD_TILT_COALESCE_MAX_GAP}° are merged for UI/listings:
- * pairs → higher tilt; runs of three or more consecutive steps merge the first two into the lower tilt.
- */
-
-/** Adjacent tilts (sorted) within this gap share one listing / control. */
-export const NEXRAD_TILT_COALESCE_MAX_GAP = 0.1;
-
-/**
- * @param {number[]} segment
- * @param {Map<number, number>} map
- */
-function mergeCoalesceSegment(segment, map) {
-    if (segment.length === 0) return;
-    if (segment.length === 1) {
-        map.set(segment[0], segment[0]);
-        return;
-    }
-    if (segment.length === 2) {
-        const canonical = Math.max(segment[0], segment[1]);
-        map.set(segment[0], canonical);
-        map.set(segment[1], canonical);
-        return;
-    }
-    const low = segment[0];
-    map.set(segment[0], low);
-    map.set(segment[1], low);
-    mergeCoalesceSegment(segment.slice(2), map);
-}
-
-/**
- * @param {number[]} sortedUnique
- * @returns {Map<number, number>}
- */
-export function chainCoalesceToCanonical(sortedUnique) {
-    const map = new Map();
-    let i = 0;
-    while (i < sortedUnique.length) {
-        let j = i + 1;
-        while (
-            j < sortedUnique.length &&
-            sortedUnique[j] - sortedUnique[j - 1] <= NEXRAD_TILT_COALESCE_MAX_GAP + 1e-9
-        ) {
-            j++;
-        }
-        const segment = sortedUnique.slice(i, j);
-        mergeCoalesceSegment(segment, map);
-        i = j;
-    }
-    return map;
-}
-
-/**
- * Manifest tilt list with adjacent options merged (pairs → higher; triple+ splits per merge rules).
- * @param {number[]} tilts
- * @returns {number[]}
- */
-export function coalesceNexradTiltOptionsForDisplay(tilts) {
-    const sorted = [...new Set(tilts)]
-        .filter((t) => Number.isFinite(t))
-        .sort((a, b) => a - b);
-    if (sorted.length <= 1) return sorted;
-    const tiltToCanonical = chainCoalesceToCanonical(sorted);
-    const reps = [];
-    let prevRep;
-    for (const t of sorted) {
-        const c = tiltToCanonical.get(t);
-        if (c === undefined) continue;
-        if (c !== prevRep) {
-            reps.push(c);
-            prevRep = c;
-        }
-    }
-    return reps;
-}
-
-/**
- * Map stored/clamped tilt to the coalesced elevation value (same rules as {@link coalesceNexradTiltOptionsForDisplay}).
- * @param {number} layerTilt
- * @param {number[]} manifestTilts raw manifest tilts (before coalescing)
- * @returns {number}
- */
-export function nexradLayerTiltToDisplayOption(layerTilt, manifestTilts) {
-    const sorted = [...new Set(manifestTilts)]
-        .filter((t) => Number.isFinite(t))
-        .sort((a, b) => a - b);
-    if (sorted.length === 0) return layerTilt;
-    const tiltToCanonical = chainCoalesceToCanonical(sorted);
-    if (tiltToCanonical.has(layerTilt)) return tiltToCanonical.get(layerTilt);
-    const nearest = sorted.reduce((best, x) =>
-        Math.abs(x - layerTilt) < Math.abs(best - layerTilt) ? x : best,
-    sorted[0]);
-    return tiltToCanonical.get(nearest) ?? layerTilt;
-}
+/**
+ * NEXRAD tilt coalescing (matches aguacero-frontend `nexradTiltCoalesce.ts`).
+ * Adjacent manifest tilts within {@link NEXRAD_TILT_COALESCE_MAX_GAP}° are merged for UI/listings:
+ * pairs → higher tilt; runs of three or more consecutive steps merge the first two into the lower tilt.
+ */
+
+/** Adjacent tilts (sorted) within this gap share one listing / control. */
+export const NEXRAD_TILT_COALESCE_MAX_GAP = 0.1;
+
+/**
+ * @param {number[]} segment
+ * @param {Map<number, number>} map
+ */
+function mergeCoalesceSegment(segment, map) {
+    if (segment.length === 0) return;
+    if (segment.length === 1) {
+        map.set(segment[0], segment[0]);
+        return;
+    }
+    if (segment.length === 2) {
+        const canonical = Math.max(segment[0], segment[1]);
+        map.set(segment[0], canonical);
+        map.set(segment[1], canonical);
+        return;
+    }
+    const low = segment[0];
+    map.set(segment[0], low);
+    map.set(segment[1], low);
+    mergeCoalesceSegment(segment.slice(2), map);
+}
+
+/**
+ * @param {number[]} sortedUnique
+ * @returns {Map<number, number>}
+ */
+export function chainCoalesceToCanonical(sortedUnique) {
+    const map = new Map();
+    let i = 0;
+    while (i < sortedUnique.length) {
+        let j = i + 1;
+        while (
+            j < sortedUnique.length &&
+            sortedUnique[j] - sortedUnique[j - 1] <= NEXRAD_TILT_COALESCE_MAX_GAP + 1e-9
+        ) {
+            j++;
+        }
+        const segment = sortedUnique.slice(i, j);
+        mergeCoalesceSegment(segment, map);
+        i = j;
+    }
+    return map;
+}
+
+/**
+ * Manifest tilt list with adjacent options merged (pairs → higher; triple+ splits per merge rules).
+ * @param {number[]} tilts
+ * @returns {number[]}
+ */
+export function coalesceNexradTiltOptionsForDisplay(tilts) {
+    const sorted = [...new Set(tilts)]
+        .filter((t) => Number.isFinite(t))
+        .sort((a, b) => a - b);
+    if (sorted.length <= 1) return sorted;
+    const tiltToCanonical = chainCoalesceToCanonical(sorted);
+    const reps = [];
+    let prevRep;
+    for (const t of sorted) {
+        const c = tiltToCanonical.get(t);
+        if (c === undefined) continue;
+        if (c !== prevRep) {
+            reps.push(c);
+            prevRep = c;
+        }
+    }
+    return reps;
+}
+
+/**
+ * Map stored/clamped tilt to the coalesced elevation value (same rules as {@link coalesceNexradTiltOptionsForDisplay}).
+ * @param {number} layerTilt
+ * @param {number[]} manifestTilts raw manifest tilts (before coalescing)
+ * @returns {number}
+ */
+export function nexradLayerTiltToDisplayOption(layerTilt, manifestTilts) {
+    const sorted = [...new Set(manifestTilts)]
+        .filter((t) => Number.isFinite(t))
+        .sort((a, b) => a - b);
+    if (sorted.length === 0) return layerTilt;
+    const tiltToCanonical = chainCoalesceToCanonical(sorted);
+    if (tiltToCanonical.has(layerTilt)) return tiltToCanonical.get(layerTilt);
+    const nearest = sorted.reduce((best, x) =>
+        Math.abs(x - layerTilt) < Math.abs(best - layerTilt) ? x : best,
+    sorted[0]);
+    return tiltToCanonical.get(nearest) ?? layerTilt;
+}

package/src/nexradTilts.js

@@ -1,128 +1,138 @@
-/**
- * NEXRAD tilt helpers (mirrors aguacero-frontend dictionaries + radar tilts manifest behavior).
- * When {@link setRadarTiltsManifest} has been called with a non-empty map, per-site tilts follow it.
- */
-
-const WSR88D_TILTS = [0.5, 0.9, 1.3, 1.8, 2.4, 3.1, 4.0, 5.1, 6.4];
-const TDWR_TILTS = [0.3, 1.0, 2, 6.5, 8.8, 16.0, 21.3];
-
-const WSR88D_SITE_IDS_WITH_T_PREFIX = new Set(['TJUA']);
-
-/** @type {Record<string, { g1_tilts: number[]; g2_tilts: number[]; last_seen?: number }>} */
-let manifestBySite = {};
-
-export function setRadarTiltsManifest(map) {
-    manifestBySite = map && typeof map === 'object' ? map : {};
-}
-
-export function getRadarTiltsManifest() {
-    return manifestBySite;
-}
-
-export function isNexradTdwrSiteId(siteId) {
-    const id = String(siteId ?? '').trim().toUpperCase();
-    if (!id) return false;
-    if (WSR88D_SITE_IDS_WITH_T_PREFIX.has(id)) return false;
-    return id.startsWith('T');
-}
-
-export function isTerminalRadar(siteId) {
-    return isNexradTdwrSiteId(siteId);
-}
-
-const NEXRAD_G2_VARIABLES = new Set(['VEL', 'SW']);
-const TDWR_DUAL_POL_CAPPED = new Set(['ZDR', 'PHI', 'RHO', 'KDP']);
-const TDWR_DUAL_POL_MAX_TILT = 0.3;
-
-function uniqSorted(nums) {
-    const arr = nums.filter((n) => typeof n === 'number' && Number.isFinite(n));
-    const rounded = arr.map((n) => Math.round(n * 1000) / 1000);
-    return [...new Set(rounded)].sort((a, b) => a - b);
-}
-
-function computeRadarTiltsFromManifestEntry(entry, siteId, radarVariable) {
-    const v = (radarVariable || 'REF').toUpperCase();
-    let base;
-    if (NEXRAD_G2_VARIABLES.has(v)) {
-        base = uniqSorted(entry.g2_tilts || []);
-    } else {
-        base = uniqSorted([...(entry.g1_tilts || []), ...(entry.g2_tilts || [])]);
-    }
-    if (isNexradTdwrSiteId(siteId) && TDWR_DUAL_POL_CAPPED.has(v)) {
-        return base.filter((t) => t <= TDWR_DUAL_POL_MAX_TILT);
-    }
-    return base;
-}
-
-function getDefaultTiltFromManifestEntry(entry) {
-    const g1 = entry.g1_tilts;
-    if (!Array.isArray(g1) || g1.length === 0) return null;
-    const sorted = uniqSorted(g1);
-    return sorted[0] ?? null;
-}
-
-export function getDefaultRadarTilt(siteId) {
-    const id = siteId?.toUpperCase();
-    const entry = id ? manifestBySite[id] : undefined;
-    if (entry) {
-        const t = getDefaultTiltFromManifestEntry(entry);
-        if (t != null) return t;
-    }
-    return isTerminalRadar(siteId) ? 0.3 : 0.5;
-}
-
-export function getRadarTilts(siteId, radarVariable) {
-    const id = siteId?.toUpperCase();
-    const entry = id ? manifestBySite[id] : undefined;
-    if (entry) {
-        const fromManifest = computeRadarTiltsFromManifestEntry(entry, siteId, radarVariable);
-        if (fromManifest.length) return fromManifest;
-    }
-    const base = isTerminalRadar(siteId) ? TDWR_TILTS : WSR88D_TILTS;
-    if (!radarVariable || !isTerminalRadar(siteId)) return [...base];
-    const v = radarVariable.toUpperCase();
-    if (['ZDR', 'PHI', 'RHO'].includes(v)) {
-        return base.filter((t) => t <= TDWR_DUAL_POL_MAX_TILT);
-    }
-    return [...base];
-}
-
-export function clampNexradTiltForVariable(siteId, variable, tilt) {
-    if (!isTerminalRadar(siteId)) return tilt;
-    const v = (variable || 'REF').toUpperCase();
-    if (['ZDR', 'PHI', 'RHO'].includes(v)) {
-        return Math.min(tilt, TDWR_DUAL_POL_MAX_TILT);
-    }
-    return tilt;
-}
-
-export function formatTiltForApi(tilt) {
-    return tilt.toFixed(2);
-}
-
-export const RADAR_TILTS_MANIFEST_URL =
-    'https://radar-tilts.s3.us-east-2.amazonaws.com/manifest.json';
-
-export async function fetchRadarTiltsManifestFromNetwork() {
-    try {
-        const res = await fetch(RADAR_TILTS_MANIFEST_URL, { cache: 'no-store' });
-        if (!res.ok) return null;
-        const raw = await res.json();
-        if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return null;
-        const out = {};
-        for (const [key, val] of Object.entries(raw)) {
-            if (!val || typeof val !== 'object' || Array.isArray(val)) continue;
-            const g1 = val.g1_tilts;
-            const g2 = val.g2_tilts;
-            if (!Array.isArray(g1) || !Array.isArray(g2)) continue;
-            out[key.toUpperCase()] = {
-                g1_tilts: g1.filter((n) => typeof n === 'number' && Number.isFinite(n)),
-                g2_tilts: g2.filter((n) => typeof n === 'number' && Number.isFinite(n)),
-                last_seen: typeof val.last_seen === 'number' ? val.last_seen : undefined,
-            };
-        }
-        return Object.keys(out).length ? out : null;
-    } catch {
-        return null;
-    }
-}
+/**
+ * NEXRAD tilt helpers (mirrors aguacero-frontend dictionaries + radar tilts manifest behavior).
+ * When {@link setRadarTiltsManifest} has been called with a non-empty map, per-site tilts follow it.
+ */
+
+const WSR88D_TILTS = [0.5, 0.9, 1.3, 1.8, 2.4, 3.1, 4.0, 5.1, 6.4];
+const TDWR_TILTS = [0.3, 1.0, 2, 6.5, 8.8, 16.0, 21.3];
+
+const WSR88D_SITE_IDS_WITH_T_PREFIX = new Set(['TJUA']);
+
+/** @type {Record<string, { g1_tilts: number[]; g2_tilts: number[]; last_seen?: number }>} */
+let manifestBySite = {};
+
+export function setRadarTiltsManifest(map) {
+    manifestBySite = map && typeof map === 'object' ? map : {};
+}
+
+export function getRadarTiltsManifest() {
+    return manifestBySite;
+}
+
+/** True when the tilt manifest has at least one g1 or g2 tilt row for this site. */
+export function radarTiltsManifestHasUsableRow(siteId) {
+    const id = String(siteId ?? '')
+        .trim()
+        .toUpperCase();
+    if (!id) return false;
+    const row = manifestBySite[id];
+    return !!(row?.g1_tilts?.length || row?.g2_tilts?.length);
+}
+
+export function isNexradTdwrSiteId(siteId) {
+    const id = String(siteId ?? '').trim().toUpperCase();
+    if (!id) return false;
+    if (WSR88D_SITE_IDS_WITH_T_PREFIX.has(id)) return false;
+    return id.startsWith('T');
+}
+
+export function isTerminalRadar(siteId) {
+    return isNexradTdwrSiteId(siteId);
+}
+
+const NEXRAD_G2_VARIABLES = new Set(['VEL', 'SW']);
+const TDWR_DUAL_POL_CAPPED = new Set(['ZDR', 'PHI', 'RHO', 'KDP']);
+const TDWR_DUAL_POL_MAX_TILT = 0.3;
+
+function uniqSorted(nums) {
+    const arr = nums.filter((n) => typeof n === 'number' && Number.isFinite(n));
+    const rounded = arr.map((n) => Math.round(n * 1000) / 1000);
+    return [...new Set(rounded)].sort((a, b) => a - b);
+}
+
+function computeRadarTiltsFromManifestEntry(entry, siteId, radarVariable) {
+    const v = (radarVariable || 'REF').toUpperCase();
+    let base;
+    if (NEXRAD_G2_VARIABLES.has(v)) {
+        base = uniqSorted(entry.g2_tilts || []);
+    } else {
+        base = uniqSorted([...(entry.g1_tilts || []), ...(entry.g2_tilts || [])]);
+    }
+    if (isNexradTdwrSiteId(siteId) && TDWR_DUAL_POL_CAPPED.has(v)) {
+        return base.filter((t) => t <= TDWR_DUAL_POL_MAX_TILT);
+    }
+    return base;
+}
+
+function getDefaultTiltFromManifestEntry(entry) {
+    const g1 = entry.g1_tilts;
+    if (!Array.isArray(g1) || g1.length === 0) return null;
+    const sorted = uniqSorted(g1);
+    return sorted[0] ?? null;
+}
+
+export function getDefaultRadarTilt(siteId) {
+    const id = siteId?.toUpperCase();
+    const entry = id ? manifestBySite[id] : undefined;
+    if (entry) {
+        const t = getDefaultTiltFromManifestEntry(entry);
+        if (t != null) return t;
+    }
+    return isTerminalRadar(siteId) ? 0.3 : 0.5;
+}
+
+export function getRadarTilts(siteId, radarVariable) {
+    const id = siteId?.toUpperCase();
+    const entry = id ? manifestBySite[id] : undefined;
+    if (entry) {
+        const fromManifest = computeRadarTiltsFromManifestEntry(entry, siteId, radarVariable);
+        if (fromManifest.length) return fromManifest;
+    }
+    const base = isTerminalRadar(siteId) ? TDWR_TILTS : WSR88D_TILTS;
+    if (!radarVariable || !isTerminalRadar(siteId)) return [...base];
+    const v = radarVariable.toUpperCase();
+    if (['ZDR', 'PHI', 'RHO'].includes(v)) {
+        return base.filter((t) => t <= TDWR_DUAL_POL_MAX_TILT);
+    }
+    return [...base];
+}
+
+export function clampNexradTiltForVariable(siteId, variable, tilt) {
+    if (!isTerminalRadar(siteId)) return tilt;
+    const v = (variable || 'REF').toUpperCase();
+    if (['ZDR', 'PHI', 'RHO'].includes(v)) {
+        return Math.min(tilt, TDWR_DUAL_POL_MAX_TILT);
+    }
+    return tilt;
+}
+
+export function formatTiltForApi(tilt) {
+    return tilt.toFixed(2);
+}
+
+export const RADAR_TILTS_MANIFEST_URL =
+    'https://radar-tilts.s3.us-east-2.amazonaws.com/manifest.json';
+
+export async function fetchRadarTiltsManifestFromNetwork() {
+    try {
+        const res = await fetch(RADAR_TILTS_MANIFEST_URL, { cache: 'no-store' });
+        if (!res.ok) return null;
+        const raw = await res.json();
+        if (!raw || typeof raw !== 'object' || Array.isArray(raw)) return null;
+        const out = {};
+        for (const [key, val] of Object.entries(raw)) {
+            if (!val || typeof val !== 'object' || Array.isArray(val)) continue;
+            const g1 = val.g1_tilts;
+            const g2 = val.g2_tilts;
+            if (!Array.isArray(g1) || !Array.isArray(g2)) continue;
+            out[key.toUpperCase()] = {
+                g1_tilts: g1.filter((n) => typeof n === 'number' && Number.isFinite(n)),
+                g2_tilts: g2.filter((n) => typeof n === 'number' && Number.isFinite(n)),
+                last_seen: typeof val.last_seen === 'number' ? val.last_seen : undefined,
+            };
+        }
+        return Object.keys(out).length ? out : null;
+    } catch {
+        return null;
+    }
+}

package/src/nexrad_level3_catalog.js

@@ -1,26 +1,26 @@
-/** Subset of aguacero-frontend NEXRAD_LEVEL3_MENU for API product resolution. */
-
-export const NEXRAD_LEVEL3_ELEV = '0.50';
-export const NEXRAD_LEVEL3_MOTION_PRODUCT = 'N0S';
-
-const MENU = [
-    { radarKey: 'VEL', product: 'N0G', fldKey: 'nexrad_vel' },
-    { radarKey: 'KDP', product: 'N0K', fldKey: 'nexrad_l3_n0k' },
-    { radarKey: 'N0H', product: 'N0H', fldKey: 'nexrad_l3_n0h' },
-    { radarKey: 'HHC', product: 'HHC', fldKey: 'nexrad_l3_hhc' },
-    { radarKey: 'EET', product: 'EET', fldKey: 'nexrad_l3_eet' },
-    { radarKey: 'DVL', product: 'DVL', fldKey: 'nexrad_l3_dvl' },
-    { radarKey: 'DAA', product: 'DAA', fldKey: 'nexrad_l3_daa' },
-    { radarKey: 'DU3', product: 'DU3', fldKey: 'nexrad_l3_du3' },
-    { radarKey: 'DTA', product: 'DTA', fldKey: 'nexrad_l3_dta' },
-];
-
-const byRadarKey = new Map();
-for (const e of MENU) {
-    byRadarKey.set(e.radarKey, e);
-}
-byRadarKey.set('NVL', byRadarKey.get('DVL'));
-
-export function getNexradLevel3EntryByRadarKey(radarKey) {
-    return byRadarKey.get(radarKey);
-}
+/** Subset of aguacero-frontend NEXRAD_LEVEL3_MENU for API product resolution. */
+
+export const NEXRAD_LEVEL3_ELEV = '0.50';
+export const NEXRAD_LEVEL3_MOTION_PRODUCT = 'N0S';
+
+const MENU = [
+    { radarKey: 'VEL', product: 'N0G', fldKey: 'nexrad_vel' },
+    { radarKey: 'KDP', product: 'N0K', fldKey: 'nexrad_l3_n0k' },
+    { radarKey: 'N0H', product: 'N0H', fldKey: 'nexrad_l3_n0h' },
+    { radarKey: 'HHC', product: 'HHC', fldKey: 'nexrad_l3_hhc' },
+    { radarKey: 'EET', product: 'EET', fldKey: 'nexrad_l3_eet' },
+    { radarKey: 'DVL', product: 'DVL', fldKey: 'nexrad_l3_dvl' },
+    { radarKey: 'DAA', product: 'DAA', fldKey: 'nexrad_l3_daa' },
+    { radarKey: 'DU3', product: 'DU3', fldKey: 'nexrad_l3_du3' },
+    { radarKey: 'DTA', product: 'DTA', fldKey: 'nexrad_l3_dta' },
+];
+
+const byRadarKey = new Map();
+for (const e of MENU) {
+    byRadarKey.set(e.radarKey, e);
+}
+byRadarKey.set('NVL', byRadarKey.get('DVL'));
+
+export function getNexradLevel3EntryByRadarKey(radarKey) {
+    return byRadarKey.get(radarKey);
+}

package/src/nexrad_support.js

@@ -7,6 +7,7 @@ import {
     clampNexradTiltForVariable,
     getDefaultRadarTilt,
     getRadarTilts,
+    radarTiltsManifestHasUsableRow,
 } from './nexradTilts.js';
 import { coalesceNexradTiltOptionsForDisplay } from './nexradTiltCoalesce.js';
 import {
@@ -49,11 +50,17 @@ export const NEXRAD_SWEEP_LAMBDA_URL = 'https://ddknicwcw2wyov7v5bzxmbqu440tzntf
 export const NEXRAD_LEVEL3_BASE_URL = 'https://unidata-nexrad-level3.s3.amazonaws.com';
 
 const NEXRAD_GROUP_G1 = ['REF', 'PHI', 'ZDR', 'RHO'];
-const NEXRAD_GROUP_G2 = ['VEL', 'SW'];
+const NEXRAD_GROUP_G2 = ['SW'];
+
+/** Level-II sweep Lambda may return unix ms; store + duration filters expect seconds. */
+function nexradLevel2ListingTimesToUnixSec(times) {
+    return times.map((t) => (typeof t === 'number' && t > 10 ** 10 ? Math.floor(t / 1000) : t));
+}
 
 export function variableToNexradGroup(variable) {
     const v = (variable || 'REF').toUpperCase();
-    if (NEXRAD_GROUP_G2.includes(v)) return 'g2';
+    /** VEL listings shard under g2 for cache clears; display fetch is usually level3. */
+    if (v === 'VEL' || NEXRAD_GROUP_G2.includes(v)) return 'g2';
     return 'g1';
 }
 
@@ -61,6 +68,12 @@ export function nexradBinGroupIdForKey(cacheGroup) {
     return cacheGroup === 'g1' ? 1 : 2;
 }
 
+/** S3 object key for a Level-II sweep (content-length suffix for overwrite cache busting). */
+export function buildLevel2SweepObjectKey(stationId, elevNorm, ts, group, v2_clen) {
+    const groupId = nexradBinGroupIdForKey(group);
+    return `${stationId}_${elevNorm}_${ts}_${v2_clen}_g${groupId}.bin`;
+}
+
 function getLevel3StationPrefix(stationId) {
     const upper = (stationId || '').toUpperCase();
     if (upper.startsWith('K') && upper.length === 4) return upper.slice(1);
@@ -217,6 +230,17 @@ export async function fetchNexradTimesListing(opts) {
             l3MotionTimeToKeyMap = l3Motion.timeToKeyMap;
         }
     } else {
+        if (!radarTiltsManifestHasUsableRow(stationId)) {
+            return {
+                cacheKey: key,
+                unixTimes: [],
+                timeToKeyMap: {},
+                level3MotionKey: level3MotionKey || null,
+                level3MotionUnixTimes: [],
+                level3MotionTimeToKeyMap: {},
+                l2StormMotionListKey: l2StormMotionListKey || null,
+            };
+        }
         const params = new URLSearchParams({
             station: stationId,
             field: group,
@@ -227,16 +251,26 @@ export async function fetchNexradTimesListing(opts) {
         const res = await fetch(url);
         if (!res.ok) throw new Error(`NEXRAD lambda HTTP ${res.status}`);
         const data = await res.json();
+        let clens = {};
         if (Array.isArray(data?.times)) {
-            times = data.times;
+            times = nexradLevel2ListingTimesToUnixSec(data.times);
+            clens = data?.clens || {};
         } else if (data?.body) {
             const body = typeof data.body === 'string' ? JSON.parse(data.body) : data.body;
-            times = Array.isArray(body?.times) ? body.times : [];
+            times = Array.isArray(body?.times) ? nexradLevel2ListingTimesToUnixSec(body.times) : [];
+            clens = body?.clens || {};
         }
-        const groupId = nexradBinGroupIdForKey(group);
         const elevNorm = elevNormUse;
         times.forEach((t) => {
-            timeToKeyMap[String(t)] = `${stationId}_${elevNorm}_${t}_g${groupId}.bin`;
+            const clen = clens[String(t)];
+            if (clen == null || !Number.isFinite(Number(clen))) return;
+            timeToKeyMap[String(t)] = buildLevel2SweepObjectKey(
+                stationId,
+                elevNorm,
+                t,
+                group,
+                Number(clen),
+            );
         });
         if (fetchL2VelMotion) {
             const l3Motion = await fetchLevel3ProductTimesForStation(