@aguacerowx/mapsgl 0.0.49 → 0.0.51

package/src/nwsAlertsSupport.js

@@ -442,6 +442,98 @@ export function getNwsAlertInstanceIdFromFeature(feature) {
     );
 }
 
+/**
+ * SVR revision visibility: superseded geometry only before cutover unix; updated geometry only at/after cutover.
+ * Returns null when this feature does not use revision split (fall back to start_unix / end_unix).
+ * Matches aguacero-frontend {@link nwsRevisionVisibilityActive}.
+ */
+export function nwsRevisionVisibilityActive(properties, referenceUnix) {
+    if (!properties) return null;
+    const role = properties._nws_revision_role;
+    const cut = properties._nws_revision_cutover_unix;
+    if (cut == null || typeof cut !== 'number' || !role) return null;
+    if (role === 'superseded') {
+        return referenceUnix < cut;
+    }
+    if (role === 'update') {
+        return referenceUnix >= cut;
+    }
+    if (role === 'current') {
+        return null;
+    }
+    return null;
+}
+
+/** nwws-server stores ids as `${vtecBaseId}.${issuedTs}`; strip the issued suffix for revision grouping. */
+function stripNwwsIssuedMillisSuffixFromId(id) {
+    const m = String(id).match(/^(.+)\.(\d{10,})$/);
+    return m ? m[1] : id;
+}
+
+/**
+ * One key per logical warning product (VTEC sequence / base id). Matches aguacero-frontend
+ * {@link getNwwsLogicalProductKey} for deduping superseded vs update rows on the time slider.
+ */
+export function getNwwsLogicalProductKey(feature) {
+    const p = feature?.properties ?? {};
+    const params = p.parameters;
+    const vtecRaw = params != null && typeof params === 'object' && !Array.isArray(params) ? params.VTEC : undefined;
+    const vtec = Array.isArray(vtecRaw)
+        ? vtecRaw[0]
+        : p.vtec ?? (p.details && typeof p.details === 'object' ? p.details.pvtec : undefined);
+    if (typeof vtec === 'string' && vtec.trim()) {
+        const parts = vtec.split('.');
+        if (parts.length >= 6) {
+            return `${parts[2]}.${parts[3]}.${parts[4]}.${parts[5]}`;
+        }
+    }
+    const base = getNwsBaseAlertIdFromFeature(feature);
+    if (base) return stripNwwsIssuedMillisSuffixFromId(base);
+    if (feature?.id != null && feature.id !== '') return stripNwwsIssuedMillisSuffixFromId(String(feature.id));
+    return null;
+}
+
+export function getNwwsProductKeyFromFeature(feature) {
+    const pk = feature?.properties?.nws_product_key;
+    if (typeof pk === 'string' && pk.trim() !== '') return pk.trim();
+    return getNwwsLogicalProductKey(feature);
+}
+
+/**
+ * When superseded + update rows both pass time checks, pick one per reference instant (same product key).
+ * Matches aguacero-frontend {@link pickBestNwsRevisionAmongConflictingFeatures}.
+ */
+export function pickBestNwsRevisionAmongConflictingFeatures(features, referenceUnix) {
+    if (!Array.isArray(features) || features.length === 0) return null;
+    if (features.length === 1) return features[0];
+    const scored = features.map((f) => {
+        const p = f?.properties ?? {};
+        const role = String(p._nws_revision_role ?? '');
+        const cut =
+            typeof p._nws_revision_cutover_unix === 'number' && Number.isFinite(p._nws_revision_cutover_unix)
+                ? p._nws_revision_cutover_unix
+                : null;
+        let slotScore = 0;
+        if (role === 'superseded' && cut != null) {
+            slotScore = referenceUnix < cut ? 2 : 0;
+        } else if (role === 'update' && cut != null) {
+            slotScore = referenceUnix >= cut ? 2 : 0;
+        } else if (role === 'current') {
+            slotScore = 1;
+        } else {
+            slotScore = 1;
+        }
+        const t =
+            parseNwsTimeToUnix(getNwsTimeProp(p, ['sent', 'updated_at', 'issued_at', 'issued'])) ?? 0;
+        return { f, slotScore, t };
+    });
+    scored.sort((a, b) => {
+        if (b.slotScore !== a.slotScore) return b.slotScore - a.slotScore;
+        return b.t - a.t;
+    });
+    return scored[0].f;
+}
+
 export function isUsableNwwsAlertGeometry(geometry) {
     if (geometry == null || typeof geometry !== 'object') return false;
     const g = geometry;
@@ -1098,6 +1190,56 @@ export function cloneNwwsFeatureCollectionStrippingVolatile(data) {
     };
 }
 
+/**
+ * Parse `properties.parameters` (JSON string or object from NWWS / CAP-style extensions).
+ * @param {unknown} raw
+ * @returns {Record<string, unknown>|null}
+ */
+function parseNwsParametersJson(raw) {
+    if (raw == null) return null;
+    if (typeof raw === 'object' && !Array.isArray(raw)) return /** @type {Record<string, unknown>} */ (raw);
+    if (typeof raw === 'string') {
+        try {
+            const o = JSON.parse(raw);
+            return o && typeof o === 'object' && !Array.isArray(o) ? o : null;
+        } catch {
+            return null;
+        }
+    }
+    return null;
+}
+
+/**
+ * Human-oriented subset of `parameters` for severe wx / common warning types (hail, wind, radar source).
+ * @param {Record<string, unknown>|null} pObj
+ * @returns {Record<string, string> | null}
+ */
+function buildHazardDetailsFromParameters(pObj) {
+    if (!pObj || typeof pObj !== 'object') return null;
+    /** @type {Record<string, string>} */
+    const out = {};
+    const set = (key, from) => {
+        const v = pObj[from];
+        if (v != null && String(v).trim() !== '') out[key] = String(v);
+    };
+    set('source', 'source');
+    set('maxHailSize', 'max_hail_size');
+    set('maxWindGust', 'max_wind_gust');
+    set('damageThreat', 'damage_threat');
+    set('wmo', 'wmo');
+    if (pObj.tornado_detection != null && String(pObj.tornado_detection).trim() !== '')
+        out.tornadoDetection = String(pObj.tornado_detection);
+    if (pObj.flood_detection != null && String(pObj.flood_detection).trim() !== '')
+        out.floodDetection = String(pObj.flood_detection);
+    return Object.keys(out).length ? out : null;
+}
+
+/**
+ * Normalized payload for `nws:alert:click`. Top-level fields are derived from `feature.properties`
+ * so you rarely need the duplicate `properties` object (kept for advanced / forward-compatible use).
+ *
+ * @param {GeoJSON.Feature|{ properties?: Record<string, unknown> }} feature
+ */
 export function buildAlertClickPayload(feature) {
     const properties = feature?.properties ? { ...feature.properties } : {};
     const eventName = getNwsAlertEventLabelFromProperties(properties);
@@ -1112,9 +1254,10 @@ export function buildAlertClickPayload(feature) {
     if (!Array.isArray(tags)) {
         tags = tags != null ? [String(tags)] : [];
     }
-    const headline = properties.headline != null ? String(properties.headline) : '';
     const name =
-        headline ||
+        (properties.headline != null && String(properties.headline).trim() !== ''
+            ? String(properties.headline)
+            : '') ||
         eventName ||
         (properties.event != null ? String(properties.event) : '') ||
         (properties.event_name != null ? String(properties.event_name) : '');
@@ -1124,8 +1267,6 @@ export function buildAlertClickPayload(feature) {
             : properties.raw_text != null
               ? String(properties.raw_text)
               : '';
-    const summary = properties.summary != null ? String(properties.summary) : '';
-    const instruction = properties.instruction != null ? String(properties.instruction) : '';
 
     const startUnix =
         typeof properties.start_unix === 'number'
@@ -1140,17 +1281,29 @@ export function buildAlertClickPayload(feature) {
             ? properties.active_start_unix
             : getNwsActiveStartUnix(properties);
 
+    const parametersParsed = parseNwsParametersJson(properties.parameters);
+    const hazardDetails = buildHazardDetailsFromParameters(parametersParsed);
+
     return {
         name,
         eventName,
-        headline,
-        summary,
         description,
-        instruction,
         tags,
         startUnix,
         endUnix,
         activeStartUnix,
+        /** ISO-ish strings from the feed (see also unix fields above). */
+        issued: properties.issued != null ? String(properties.issued) : '',
+        updatedAt: properties.updated_at != null ? String(properties.updated_at) : '',
+        expiresAt: properties.expires != null ? String(properties.expires) : '',
+        alertId: properties.alert_id != null ? String(properties.alert_id) : '',
+        office: properties.office != null ? String(properties.office) : '',
+        nwsProductKey: properties.nws_product_key != null ? String(properties.nws_product_key) : '',
+        /** Parsed `properties.parameters` JSON when present (hail/wind/source keys vary by product). */
+        parametersParsed,
+        /** Short labels for SV / similar products: source, maxHailSize, maxWindGust, damageThreat, … */
+        hazardDetails,
+        /** Same as `feature.properties` — prefer top-level fields above when possible. */
         properties,
     };
 }