gnss-js 1.36.0 → 1.37.0

package/dist/binex.js

@@ -6,8 +6,8 @@ import {
   decodeBinexEph,
   getBnxi,
   parseBinex
-} from "./chunk-OK4GGNOO.js";
-import "./chunk-IQ5OIMQD.js";
+} from "./chunk-D25WNE43.js";
+import "./chunk-V2D5KUKH.js";
 export {
   binexCrc16,
   binexCrc32,

package/dist/{chunk-AFEDNWXI.js → chunk-24TKGUTY.js}

@@ -7,16 +7,18 @@ import {
   galFnavPageCrcOk,
   galInavPageCrcOk,
   testGloString
-} from "./chunk-5AUK42AL.js";
+} from "./chunk-FA2UTLEQ.js";
 import {
   CnavAssembler,
   cnavCrcOk,
   crc24q
-} from "./chunk-726LQBGM.js";
+} from "./chunk-YUW33VXK.js";
 import {
+  GpsLnavAssembler,
   getBitS,
-  getBitU
-} from "./chunk-IQ5OIMQD.js";
+  getBitU,
+  setBitU
+} from "./chunk-V2D5KUKH.js";
 import {
   getGpsLeap
 } from "./chunk-HVXYFUCB.js";
@@ -423,38 +425,78 @@ function parseSbfIonoUtc(data) {
   return { ionoCorrections, leapSeconds };
 }
 
+// src/sbf/rawnav-gps.ts
+var WNC_DNU = 65535;
+function extractSbfLnavSubframe(view, b) {
+  const sf = new Uint8Array(30);
+  for (let k = 0; k < 10; k++) {
+    const w = view.getUint32(b + 20 + 4 * k, true);
+    setBitU(sf, 24 * k, 24, w >>> 6 & 16777215);
+  }
+  return sf;
+}
+function feedGpsLnavBlock(view, b, assembler) {
+  const prn = svidToPrn(view.getUint8(b + 14));
+  if (!prn || prn[0] !== "G" && prn[0] !== "J") return {};
+  if (view.getUint8(b + 15) !== 1) return {};
+  const wnc = view.getUint16(b + 12, true);
+  if (wnc === WNC_DNU) return {};
+  const r = assembler.push(prn, extractSbfLnavSubframe(view, b), wnc);
+  if (r.kind === "eph") return { eph: r.eph };
+  if (r.kind === "decodeFailed") return { badParity: true };
+  return {};
+}
+function parseSbfGpsNav(data) {
+  const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+  const ephemerides = [];
+  const assembler = new GpsLnavAssembler();
+  let badParity = 0;
+  let messages = 0;
+  scanSbfFrames(data, view, (id, b, len) => {
+    if (id !== 4017 && id !== 4066 || len < 60) return;
+    messages++;
+    const r = feedGpsLnavBlock(view, b, assembler);
+    if (r.eph) ephemerides.push(r.eph);
+    else if (r.badParity) badParity++;
+  });
+  return { ephemerides, badParity, messages };
+}
+
 // src/sbf/rawnav.ts
-var SIGNAL_OF_BLOCK = {
+var CNAV_SIGNAL_OF_BLOCK = {
   4018: "L2C",
   4019: "L5"
 };
+function newCnavAssemblers() {
+  return { L2C: new CnavAssembler(), L5: new CnavAssembler() };
+}
+function feedCnavBlock(view, b, id, asm) {
+  const signal = CNAV_SIGNAL_OF_BLOCK[id];
+  if (!signal) return {};
+  const msg = new Uint8Array(40);
+  for (let k = 0; k < 10; k++) {
+    const w = view.getUint32(b + 20 + 4 * k, true);
+    msg[4 * k] = w >>> 24;
+    msg[4 * k + 1] = w >>> 16 & 255;
+    msg[4 * k + 2] = w >>> 8 & 255;
+    msg[4 * k + 3] = w & 255;
+  }
+  if (!cnavCrcOk(msg)) return { badCrc: true };
+  const eph = asm[signal].push(msg);
+  return eph ? { eph: { ...eph, signal } } : {};
+}
 function parseSbfCnav(data) {
   const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
   const ephemerides = [];
-  const assemblers = {
-    L2C: new CnavAssembler(),
-    L5: new CnavAssembler()
-  };
+  const asm = newCnavAssemblers();
   let badCrc = 0;
   let messages = 0;
   scanSbfFrames(data, view, (id, b, len) => {
-    const signal = SIGNAL_OF_BLOCK[id];
-    if (!signal || len < 60) return;
+    if (!CNAV_SIGNAL_OF_BLOCK[id] || len < 60) return;
     messages++;
-    const msg = new Uint8Array(40);
-    for (let k = 0; k < 10; k++) {
-      const w = view.getUint32(b + 20 + 4 * k, true);
-      msg[4 * k] = w >>> 24;
-      msg[4 * k + 1] = w >>> 16 & 255;
-      msg[4 * k + 2] = w >>> 8 & 255;
-      msg[4 * k + 3] = w & 255;
-    }
-    if (!cnavCrcOk(msg)) {
-      badCrc++;
-      return;
-    }
-    const eph = assemblers[signal].push(msg);
-    if (eph) ephemerides.push({ ...eph, signal });
+    const r = feedCnavBlock(view, b, id, asm);
+    if (r.eph) ephemerides.push(r.eph);
+    else if (r.badCrc) badCrc++;
   });
   return { ephemerides, badCrc, messages };
 }
@@ -462,50 +504,51 @@ function parseSbfCnav(data) {
 // src/sbf/rawnav-gal.ts
 var INAV_SOURCES = [17, 21, 22];
 var FNAV_SOURCES = [20, 22];
+function newGalAssemblers() {
+  return { inav: new GalInavAssembler(), fnav: new GalFnavAssembler() };
+}
+function feedGalBlock(data, view, b, id, asm) {
+  const prnStr = svidToPrn(data[b + 14]);
+  if (!prnStr || prnStr[0] !== "E") return {};
+  const prn = parseInt(prnStr.slice(1), 10);
+  const source = data[b + 17] & 31;
+  const page = new Uint8Array(32);
+  for (let k = 0; k < 8; k++) {
+    const w = view.getUint32(b + 20 + 4 * k, true);
+    page[4 * k] = w >>> 24;
+    page[4 * k + 1] = w >>> 16 & 255;
+    page[4 * k + 2] = w >>> 8 & 255;
+    page[4 * k + 3] = w & 255;
+  }
+  let eph;
+  let src;
+  if (id === 4023) {
+    src = "inav";
+    if (!INAV_SOURCES.includes(source)) return {};
+    if (getBitU2(page, 0) !== 0 || getBitU2(page, 114) !== 1) return {};
+    if (!galInavPageCrcOk(page)) return { badCrc: true };
+    eph = asm.inav.push(prn, page);
+  } else {
+    src = "fnav";
+    if (!FNAV_SOURCES.includes(source)) return {};
+    if (isFnavDummy(page)) return {};
+    if (!galFnavPageCrcOk(page)) return { badCrc: true };
+    eph = asm.fnav.push(prn, page);
+  }
+  return eph ? { eph: { ...eph, source: src } } : {};
+}
 function parseSbfGalNav(data) {
   const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
   const ephemerides = [];
-  const inav = new GalInavAssembler();
-  const fnav = new GalFnavAssembler();
+  const asm = newGalAssemblers();
   let badCrc = 0;
   let messages = 0;
   scanSbfFrames(data, view, (id, b, len) => {
     if (id !== 4022 && id !== 4023 || len < 52) return;
     messages++;
-    const prnStr = svidToPrn(data[b + 14]);
-    if (!prnStr || prnStr[0] !== "E") return;
-    const prn = parseInt(prnStr.slice(1), 10);
-    const source = data[b + 17] & 31;
-    const page = new Uint8Array(32);
-    for (let k = 0; k < 8; k++) {
-      const w = view.getUint32(b + 20 + 4 * k, true);
-      page[4 * k] = w >>> 24;
-      page[4 * k + 1] = w >>> 16 & 255;
-      page[4 * k + 2] = w >>> 8 & 255;
-      page[4 * k + 3] = w & 255;
-    }
-    let eph;
-    let src;
-    if (id === 4023) {
-      src = "inav";
-      if (!INAV_SOURCES.includes(source)) return;
-      if (getBitU2(page, 0) !== 0 || getBitU2(page, 114) !== 1) return;
-      if (!galInavPageCrcOk(page)) {
-        badCrc++;
-        return;
-      }
-      eph = inav.push(prn, page);
-    } else {
-      src = "fnav";
-      if (!FNAV_SOURCES.includes(source)) return;
-      if (isFnavDummy(page)) return;
-      if (!galFnavPageCrcOk(page)) {
-        badCrc++;
-        return;
-      }
-      eph = fnav.push(prn, page);
-    }
-    if (eph) ephemerides.push({ ...eph, source: src });
+    const r = feedGalBlock(data, view, b, id, asm);
+    if (r.eph) ephemerides.push(r.eph);
+    else if (r.badCrc) badCrc++;
   });
   return { ephemerides, badCrc, messages };
 }
@@ -520,7 +563,26 @@ function isFnavDummy(page) {
 var GPS_EPOCH_MS2 = Date.UTC(1980, 0, 6);
 var MS_PER_WEEK2 = 7 * 86400 * 1e3;
 var TOW_DNU = 4294967295;
-var WNC_DNU = 65535;
+var WNC_DNU2 = 65535;
+function feedBdsBlock(view, b, assembler) {
+  const prn = svidToPrn(view.getUint8(b + 14));
+  if (!prn || prn[0] !== "C") return {};
+  const sf = new Uint8Array(38);
+  for (let k = 0; k < 10; k++) {
+    const w = view.getUint32(b + 20 + 4 * k, true);
+    sf[4 * k] = w >>> 24;
+    if (k < 9) {
+      sf[4 * k + 1] = w >>> 16 & 255;
+      sf[4 * k + 2] = w >>> 8 & 255;
+      sf[4 * k + 3] = w & 255;
+    } else {
+      sf[37] = w >>> 16 & 240;
+    }
+  }
+  if (!bdsSubframeParityOk(sf)) return { badCrc: true };
+  const eph = assembler.push(prn, sf);
+  return eph ? { eph } : {};
+}
 function parseSbfBdsNav(data) {
   const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
   const ephemerides = [];
@@ -530,29 +592,41 @@ function parseSbfBdsNav(data) {
   scanSbfFrames(data, view, (id, b, len) => {
     if (id !== 4047 || len < 60) return;
     messages++;
-    const prn = svidToPrn(view.getUint8(b + 14));
-    if (!prn || prn[0] !== "C") return;
-    const sf = new Uint8Array(38);
-    for (let k = 0; k < 10; k++) {
-      const w = view.getUint32(b + 20 + 4 * k, true);
-      sf[4 * k] = w >>> 24;
-      if (k < 9) {
-        sf[4 * k + 1] = w >>> 16 & 255;
-        sf[4 * k + 2] = w >>> 8 & 255;
-        sf[4 * k + 3] = w & 255;
-      } else {
-        sf[37] = w >>> 16 & 240;
-      }
-    }
-    if (!bdsSubframeParityOk(sf)) {
-      badCrc++;
-      return;
-    }
-    const eph = assembler.push(prn, sf);
-    if (eph) ephemerides.push(eph);
+    const r = feedBdsBlock(view, b, assembler);
+    if (r.eph) ephemerides.push(r.eph);
+    else if (r.badCrc) badCrc++;
   });
   return { ephemerides, badCrc, messages };
 }
+function feedGloBlock(view, b, assembler) {
+  const prn = svidToPrn(view.getUint8(b + 14));
+  if (!prn || prn[0] !== "R") return {};
+  const towMs = view.getUint32(b + 8, true);
+  const wnc = view.getUint16(b + 12, true);
+  if (towMs === TOW_DNU || wnc === WNC_DNU2) return {};
+  const str = new Uint8Array(11);
+  for (let k = 0; k < 3; k++) {
+    const w = view.getUint32(b + 20 + 4 * k, true);
+    str[4 * k] = w >>> 24;
+    if (k < 2) {
+      str[4 * k + 1] = w >>> 16 & 255;
+      str[4 * k + 2] = w >>> 8 & 255;
+      str[4 * k + 3] = w & 255;
+    } else {
+      str[9] = w >>> 16 & 255;
+      str[10] = w >>> 8 & 248;
+    }
+  }
+  if (!testGloString(str)) return { badCrc: true };
+  const eph = assembler.push(
+    prn,
+    str,
+    new Date(GPS_EPOCH_MS2 + wnc * MS_PER_WEEK2 + towMs),
+    view.getUint8(b + 18) - 8
+    // FreqNr, offset by 8
+  );
+  return eph ? { eph } : {};
+}
 function parseSbfGloNav(data) {
   const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
   const ephemerides = [];
@@ -562,38 +636,161 @@ function parseSbfGloNav(data) {
   scanSbfFrames(data, view, (id, b, len) => {
     if (id !== 4026 || len < 32) return;
     messages++;
-    const prn = svidToPrn(view.getUint8(b + 14));
-    if (!prn || prn[0] !== "R") return;
-    const towMs = view.getUint32(b + 8, true);
-    const wnc = view.getUint16(b + 12, true);
-    if (towMs === TOW_DNU || wnc === WNC_DNU) return;
-    const str = new Uint8Array(11);
-    for (let k = 0; k < 3; k++) {
-      const w = view.getUint32(b + 20 + 4 * k, true);
-      str[4 * k] = w >>> 24;
-      if (k < 2) {
-        str[4 * k + 1] = w >>> 16 & 255;
-        str[4 * k + 2] = w >>> 8 & 255;
-        str[4 * k + 3] = w & 255;
-      } else {
-        str[9] = w >>> 16 & 255;
-        str[10] = w >>> 8 & 248;
-      }
+    const r = feedGloBlock(view, b, assembler);
+    if (r.eph) ephemerides.push(r.eph);
+    else if (r.badCrc) badCrc++;
+  });
+  return { ephemerides, badCrc, messages };
+}
+
+// src/sbf/navigation.ts
+var F4_DNU3 = -2e10;
+function ephKey(e) {
+  const source = "source" in e ? e.source : "";
+  return `${e.prn}|${e.tocDate.getTime()}|${source}`;
+}
+function decodeSbfNavigation(data) {
+  const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+  const ephemerides = [];
+  const seen = /* @__PURE__ */ new Set();
+  const cnav = [];
+  const ionoCorrections = {};
+  let leapSeconds = null;
+  const counts = {
+    decodedNav: 0,
+    gpsLnavRaw: 0,
+    cnavRaw: 0,
+    galRaw: 0,
+    gloRaw: 0,
+    bdsRaw: 0,
+    badFrames: 0
+  };
+  const cnavAsm = newCnavAssemblers();
+  const galAsm = newGalAssemblers();
+  const gloAsm = new GloStringAssembler();
+  const bdsAsm = new BdsAssembler();
+  const lnavAsm = new GpsLnavAssembler();
+  const addEph = (e) => {
+    if (!e) return;
+    const key = ephKey(e);
+    if (seen.has(key)) return;
+    seen.add(key);
+    ephemerides.push(e);
+  };
+  const f4s = (b, n) => {
+    const out = [];
+    for (let k = 0; k < n; k++) {
+      const v = view.getFloat32(b + 4 * k, true);
+      if (v === F4_DNU3) return null;
+      out.push(v);
     }
-    if (!testGloString(str)) {
-      badCrc++;
-      return;
+    return out;
+  };
+  scanSbfFrames(data, view, (id, b, len) => {
+    switch (id) {
+      /* ---- decoded ephemeris blocks ---- */
+      case 5891:
+        if (len >= 140) {
+          counts.decodedNav++;
+          addEph(decodeGpsQzsNav(view, b, "G"));
+        }
+        return;
+      case 4095:
+        if (len >= 140) {
+          counts.decodedNav++;
+          addEph(decodeGpsQzsNav(view, b, "J"));
+        }
+        return;
+      case 4002:
+        if (len >= 149) {
+          counts.decodedNav++;
+          addEph(decodeGalNav(view, b));
+        }
+        return;
+      case 4081:
+        if (len >= 140) {
+          counts.decodedNav++;
+          addEph(decodeBdsNav(view, b));
+        }
+        return;
+      case 4004:
+        if (len >= 96) {
+          counts.decodedNav++;
+          addEph(decodeGloNav(view, b));
+        }
+        return;
+      /* ---- raw navigation-frame blocks ---- */
+      case 4017:
+      // GPSRawCA
+      case 4066: {
+        if (len < 60) return;
+        counts.gpsLnavRaw++;
+        const r = feedGpsLnavBlock(view, b, lnavAsm);
+        if (r.eph) addEph(r.eph);
+        else if (r.badParity) counts.badFrames++;
+        return;
+      }
+      case 4018:
+      // GPSRawL2C
+      case 4019: {
+        if (len < 60) return;
+        counts.cnavRaw++;
+        const r = feedCnavBlock(view, b, id, cnavAsm);
+        if (r.eph) cnav.push(r.eph);
+        else if (r.badCrc) counts.badFrames++;
+        return;
+      }
+      case 4022:
+      // GALRawFNAV
+      case 4023: {
+        if (len < 52) return;
+        counts.galRaw++;
+        const r = feedGalBlock(data, view, b, id, galAsm);
+        if (r.eph) addEph(r.eph);
+        else if (r.badCrc) counts.badFrames++;
+        return;
+      }
+      case 4026: {
+        if (len < 32) return;
+        counts.gloRaw++;
+        const r = feedGloBlock(view, b, gloAsm);
+        if (r.eph) addEph(r.eph);
+        else if (r.badCrc) counts.badFrames++;
+        return;
+      }
+      case 4047: {
+        if (len < 60) return;
+        counts.bdsRaw++;
+        const r = feedBdsBlock(view, b, bdsAsm);
+        if (r.eph) addEph(r.eph);
+        else if (r.badCrc) counts.badFrames++;
+        return;
+      }
+      /* ---- iono / UTC ---- */
+      case 5893:
+      // GPSIon
+      case 4120: {
+        if (len < 48) return;
+        const alpha = f4s(b + 16, 4);
+        const beta = f4s(b + 32, 4);
+        if (!alpha || !beta) return;
+        const sys = id === 5893 ? "GPS" : "BDS";
+        ionoCorrections[`${sys}A`] = alpha;
+        ionoCorrections[`${sys}B`] = beta;
+        return;
+      }
+      case 4030: {
+        if (len < 28) return;
+        const ai = f4s(b + 16, 3);
+        if (ai) ionoCorrections["GAL"] = ai;
+        return;
+      }
+      case 5894:
+        if (len >= 37) leapSeconds = view.getInt8(b + 33);
+        return;
     }
-    const eph = assembler.push(
-      prn,
-      str,
-      new Date(GPS_EPOCH_MS2 + wnc * MS_PER_WEEK2 + towMs),
-      view.getUint8(b + 18) - 8
-      // FreqNr, offset by 8
-    );
-    if (eph) ephemerides.push(eph);
   });
-  return { ephemerides, badCrc, messages };
+  return { ephemerides, cnav, ionoCorrections, leapSeconds, counts };
 }
 
 // src/navbits/rs255.ts
@@ -1793,10 +1990,12 @@ export {
   parseSbfNav,
   parseSbfAlmanac,
   parseSbfIonoUtc,
+  parseSbfGpsNav,
   parseSbfCnav,
   parseSbfGalNav,
   parseSbfBdsNav,
   parseSbfGloNav,
+  decodeSbfNavigation,
   parseSbfHas,
   parseSbfMeas
 };

package/dist/{chunk-F4CM6Q4F.js → chunk-5X4AG4MK.js}

@@ -1,10 +1,10 @@
 import {
   CnavAssembler,
   cnavCrcOk
-} from "./chunk-726LQBGM.js";
+} from "./chunk-YUW33VXK.js";
 import {
   decodeGpsLnavFrame
-} from "./chunk-IQ5OIMQD.js";
+} from "./chunk-V2D5KUKH.js";
 import {
   getUtcDate
 } from "./chunk-HVXYFUCB.js";

package/dist/{chunk-5RNDQQ6J.js → chunk-6SWJTN6H.js}

@@ -1,10 +1,10 @@
 import {
   CNAV_A_REF,
   CNAV_OMEGA_DOT_REF
-} from "./chunk-726LQBGM.js";
+} from "./chunk-YUW33VXK.js";
 import {
   GPS_PI
-} from "./chunk-IQ5OIMQD.js";
+} from "./chunk-V2D5KUKH.js";
 import {
   C_LIGHT
 } from "./chunk-FIEWO4J4.js";

package/dist/{chunk-OK4GGNOO.js → chunk-D25WNE43.js}

@@ -2,7 +2,7 @@ import {
   GPS_PI,
   getBitS,
   getBitU
-} from "./chunk-IQ5OIMQD.js";
+} from "./chunk-V2D5KUKH.js";
 
 // src/binex/frame.ts
 var CRC16_TABLE = (() => {

package/dist/{chunk-5AUK42AL.js → chunk-FA2UTLEQ.js}

@@ -1,11 +1,11 @@
 import {
   crc24q
-} from "./chunk-726LQBGM.js";
+} from "./chunk-YUW33VXK.js";
 import {
   GPS_PI,
   getBitS,
   getBitU
-} from "./chunk-IQ5OIMQD.js";
+} from "./chunk-V2D5KUKH.js";
 import {
   getUtcDate
 } from "./chunk-HVXYFUCB.js";

package/dist/{chunk-IQ5OIMQD.js → chunk-V2D5KUKH.js}

@@ -25,6 +25,38 @@ function setBitU(buff, pos, len, data) {
     }
   }
 }
+var GpsLnavAssembler = class _GpsLnavAssembler {
+  buffers = /* @__PURE__ */ new Map();
+  last = /* @__PURE__ */ new Map();
+  /** Subframe ID (1–5) from the HOW word of a parity-stripped subframe. */
+  static subframeId(subframe) {
+    return getBitU(subframe, 43, 3);
+  }
+  /**
+   * Push one parity-stripped 30-byte LNAV subframe for `prn`, resolving
+   * the 10-bit week against `refWeek`. See {@link LnavPush} for outcomes.
+   */
+  push(prn, subframe, refWeek) {
+    const id = _GpsLnavAssembler.subframeId(subframe);
+    if (id < 1 || id > 3) return { kind: "skipped" };
+    let sf = this.buffers.get(prn);
+    if (!sf) {
+      sf = { buf: new Uint8Array(90), have: 0 };
+      this.buffers.set(prn, sf);
+    }
+    sf.buf.set(subframe, (id - 1) * 30);
+    sf.have |= 1 << id - 1;
+    if (id !== 3 || sf.have !== 7) return { kind: "incomplete" };
+    const eph = decodeGpsLnavFrame(sf.buf, { prn, refWeek });
+    if (!eph) return { kind: "decodeFailed" };
+    const prev = this.last.get(prn);
+    if (prev && prev.iode === eph.iode && prev.tocDate.getTime() === eph.tocDate.getTime()) {
+      return { kind: "duplicate" };
+    }
+    this.last.set(prn, eph);
+    return { kind: "eph", eph };
+  }
+};
 function decodeGpsLnavFrame(subframes, opts = {}) {
   if (subframes.length < 90) return null;
   const b = subframes;
@@ -144,5 +176,6 @@ export {
   getBitU,
   getBitS,
   setBitU,
+  GpsLnavAssembler,
   decodeGpsLnavFrame
 };

package/dist/{chunk-726LQBGM.js → chunk-YUW33VXK.js}

@@ -2,7 +2,7 @@ import {
   GPS_PI,
   getBitS,
   getBitU
-} from "./chunk-IQ5OIMQD.js";
+} from "./chunk-V2D5KUKH.js";
 
 // src/navbits/cnav.ts
 var GPS_EPOCH_MS = Date.UTC(1980, 0, 6);

package/dist/{chunk-FEOMYZEU.js → chunk-ZQDLYLQA.js}

@@ -5,17 +5,17 @@ import {
   bdsSubframeParityOk,
   galInavPageCrcOk,
   testGloString
-} from "./chunk-5AUK42AL.js";
+} from "./chunk-FA2UTLEQ.js";
 import {
   CnavAssembler,
   cnavCrcOk
-} from "./chunk-726LQBGM.js";
+} from "./chunk-YUW33VXK.js";
 import {
-  decodeGpsLnavFrame,
+  GpsLnavAssembler,
   getBitS,
   getBitU,
   setBitU
-} from "./chunk-IQ5OIMQD.js";
+} from "./chunk-V2D5KUKH.js";
 
 // src/ubx/frame.ts
 function* ubxFrames(data, stats = { badChecksums: 0 }) {
@@ -92,38 +92,19 @@ function parseUbxNav(data, opts = {}) {
     }
   }
   if (refWeek === void 0) return { ephemerides, badParity };
-  const subframes = /* @__PURE__ */ new Map();
-  const last = /* @__PURE__ */ new Map();
+  const assembler = new GpsLnavAssembler();
   for (const f of ubxFrames(data)) {
     if (f.msgClass !== 2 || f.msgId !== 19) continue;
     const lnav = readLnavSubframe(view, f);
     if (!lnav) continue;
-    const { prn, gnssId, svId, buff, id } = lnav;
+    const { prn, buff, id } = lnav;
     if (id < 1 || id > 5) {
       badParity++;
       continue;
     }
-    if (id > 3) continue;
-    const key = gnssId * 256 + svId;
-    let sf = subframes.get(key);
-    if (!sf) {
-      sf = { buf: new Uint8Array(90), have: 0 };
-      subframes.set(key, sf);
-    }
-    sf.buf.set(buff, (id - 1) * 30);
-    sf.have |= 1 << id - 1;
-    if (id !== 3 || sf.have !== 7) continue;
-    const eph = decodeGpsLnavFrame(sf.buf, { prn, refWeek });
-    if (!eph) {
-      badParity++;
-      continue;
-    }
-    const prev = last.get(prn);
-    if (prev && prev.iode === eph.iode && prev.tocDate.getTime() === eph.tocDate.getTime()) {
-      continue;
-    }
-    last.set(prn, eph);
-    ephemerides.push(eph);
+    const r = assembler.push(prn, buff, refWeek);
+    if (r.kind === "eph") ephemerides.push(r.eph);
+    else if (r.kind === "decodeFailed") badParity++;
   }
   return { ephemerides, badParity };
 }