gnss-js 2.10.1 → 2.12.0

package/dist/{chunk-3U5AX7PY.js → chunk-FEABDV5P.js}

@@ -5,20 +5,14 @@ import {
 // src/rinex/crx.ts
 function crxRepair(old, diff) {
   const chars = old.split("");
-  for (let i = 0; i < diff.length; i++) {
+  const n = Math.min(old.length, diff.length);
+  for (let i = 0; i < n; i++) {
     const dc = diff[i];
-    if (dc === " ") {
-    } else if (dc === "&") {
-      chars[i] = " ";
-    } else {
-      chars[i] = dc;
-    }
-  }
-  if (diff.length > chars.length) {
-    for (let i = chars.length; i < diff.length; i++) {
-      chars[i] = diff[i] === "&" ? " " : diff[i];
-    }
+    if (dc === " ") continue;
+    chars[i] = dc === "&" ? " " : dc;
   }
+  for (let i = old.length; i < diff.length; i++)
+    chars[i] = diff[i] === "&" ? " " : diff[i];
   return chars.join("");
 }
 function parseCrxDataLine(line, ntype) {
@@ -266,6 +260,15 @@ function readObsValue(line, index) {
   const v = parseFloat(raw);
   return isNaN(v) ? null : v;
 }
+function normalizePrn(id) {
+  let sys = id[0];
+  let num = id.substring(1);
+  if (sys === " " || /\d/.test(sys)) {
+    num = id;
+    sys = "G";
+  }
+  return sys + num.replace(/\s/g, "").padStart(2, "0");
+}
 function parseEpochLine3(line) {
   if (line[0] !== ">") return null;
   const yr = parseInt(line.substring(2, 6));
@@ -415,7 +418,7 @@ async function parseRinexStream(file, onProgress, signal, onSatObs, workerMode)
   function processSatLineV3(line) {
     if (!header || line.length < 3) return;
     const sys = line[0];
-    const prn = line.substring(0, 3);
+    const prn = normalizePrn(line.substring(0, 3));
     trackSat(sys, prn);
     const obsLine = line.substring(3);
     const codes = header.obsTypes[sys] ?? [];
@@ -440,10 +443,8 @@ async function parseRinexStream(file, onProgress, signal, onSatObs, workerMode)
   let v2ObsAccum = [];
   function processSatLineV2(line) {
     if (!header || v2SatIndex >= v2SatIds.length) return;
-    const satId = v2SatIds[v2SatIndex];
-    let sys = satId[0];
-    if (sys === " " || /\d/.test(sys)) sys = "G";
-    const prn = sys + satId.substring(1).padStart(2, "0");
+    const prn = normalizePrn(v2SatIds[v2SatIndex]);
+    const sys = prn[0];
     if (v2CurrentSatLine === 0) {
       trackSat(sys, prn);
       if (onSatObs) v2ObsAccum = [];
@@ -534,6 +535,7 @@ async function parseRinexStream(file, onProgress, signal, onSatObs, workerMode)
         } else {
           epochLine = crxRepair(crxPrevEpochLine, line);
         }
+        epochLine = epochLine.replace(/ +$/, "");
         if (isV3) {
           if (epochLine[0] !== ">") return;
           const info = parseEpochLine3(epochLine);
@@ -551,10 +553,11 @@ async function parseRinexStream(file, onProgress, signal, onSatObs, workerMode)
             return;
           }
           resetEpochAccum(info);
-          const satPart = epochLine.substring(41).replace(/\s+$/, "");
           crxSatList = [];
-          for (let i = 0; i + 3 <= satPart.length; i += 3) {
-            crxSatList.push(satPart.substring(i, i + 3));
+          for (let k = 0; k < info.numSats; k++) {
+            crxSatList.push(
+              normalizePrn(epochLine.substring(41 + 3 * k, 44 + 3 * k))
+            );
           }
           crxSatIndex = 0;
           crxPrevEpochLine = epochLine;
@@ -575,11 +578,7 @@ async function parseRinexStream(file, onProgress, signal, onSatObs, workerMode)
             return;
           }
           resetEpochAccum(info);
-          crxSatList = (info.satIds ?? []).map((id) => {
-            let sys = id[0];
-            if (sys === " " || /\d/.test(sys)) sys = "G";
-            return sys + id.substring(1).padStart(2, "0");
-          });
+          crxSatList = (info.satIds ?? []).slice(0, info.numSats).map(normalizePrn);
           crxSatIndex = 0;
           crxPrevEpochLine = epochLine;
           crxPhase = "clock";

package/dist/{chunk-WQX354KD.js → chunk-H3AKFD25.js}

@@ -1,6 +1,6 @@
 import {
   crc24q
-} from "./chunk-YUW33VXK.js";
+} from "./chunk-HUXQABJI.js";
 import {
   getBitS,
   getBitU

package/dist/{chunk-YUW33VXK.js → chunk-HUXQABJI.js}

@@ -205,5 +205,7 @@ export {
   CNAV_OMEGA_DOT_REF,
   crc24q,
   cnavCrcOk,
+  getBitU33,
+  getBitS33,
   CnavAssembler
 };

package/dist/{chunk-74IVYOQV.js → chunk-HWHD5E6V.js}

@@ -1,28 +1,43 @@
+import {
+  scanSbfFrames,
+  svidToPrn
+} from "./chunk-E3Y6YKQM.js";
 import {
   BdsAssembler,
-  GalFnavAssembler,
-  GalInavAssembler,
   GloStringAssembler,
   bdsSubframeParityOk,
-  galFnavPageCrcOk,
-  galInavPageCrcOk,
   testGloString
-} from "./chunk-3KSDL3CO.js";
+} from "./chunk-NIJ6WFQJ.js";
+import {
+  GalFnavAssembler,
+  GalInavAssembler,
+  galFnavPageCrcOk,
+  galInavPageCrcOk
+} from "./chunk-TWGZTRBL.js";
 import {
   decodeSbasGeoNav,
   sbasCrcOk
-} from "./chunk-WQX354KD.js";
+} from "./chunk-H3AKFD25.js";
 import {
   getGpsLeap
 } from "./chunk-HVXYFUCB.js";
 import {
   geodeticToEcef
 } from "./chunk-37QNKGTC.js";
+import {
+  BdsCnav1Assembler,
+  BdsCnav2Assembler,
+  BdsCnav3Assembler,
+  bdsCnav1Sf2CrcOk,
+  bdsCnav1Sf3CrcOk,
+  bdsCnav2CrcOk,
+  bdsCnav3CrcOk
+} from "./chunk-NL2ORX75.js";
 import {
   CnavAssembler,
   cnavCrcOk,
   crc24q
-} from "./chunk-YUW33VXK.js";
+} from "./chunk-HUXQABJI.js";
 import {
   GPS_PI,
   GpsLnavAssembler,
@@ -31,66 +46,6 @@ import {
   setBitU
 } from "./chunk-V2D5KUKH.js";
 
-// src/sbf/frame.ts
-var CRC_TABLE = (() => {
-  const t = new Uint16Array(256);
-  for (let n = 0; n < 256; n++) {
-    let c = n << 8;
-    for (let k = 0; k < 8; k++)
-      c = c & 32768 ? (c << 1 ^ 4129) & 65535 : c << 1 & 65535;
-    t[n] = c;
-  }
-  return t;
-})();
-function crc16(data, start, end) {
-  let crc = 0;
-  for (let i = start; i < end; i++)
-    crc = (crc << 8 ^ CRC_TABLE[(crc >> 8 ^ data[i]) & 255]) & 65535;
-  return crc;
-}
-function scanSbfFrames(data, view, onBlock) {
-  let badCrc = 0;
-  let i = 0;
-  while (i + 8 <= data.length) {
-    if (data[i] !== 36 || data[i + 1] !== 64) {
-      i++;
-      continue;
-    }
-    const len = view.getUint16(i + 6, true);
-    if (len < 8 || len % 4 !== 0) {
-      i++;
-      continue;
-    }
-    if (i + len > data.length) break;
-    if (crc16(data, i + 4, i + len) !== view.getUint16(i + 2, true)) {
-      badCrc++;
-      i++;
-      continue;
-    }
-    onBlock(view.getUint16(i + 4, true) & 8191, i, len);
-    i += len;
-  }
-  return badCrc;
-}
-var two = (n) => String(n).padStart(2, "0");
-function svidToPrn(svid) {
-  if (svid >= 1 && svid <= 37) return svid <= 32 ? `G${two(svid)}` : null;
-  if (svid <= 61) return svid - 37 <= 27 ? `R${two(svid - 37)}` : null;
-  if (svid <= 62) return null;
-  if (svid <= 68) return svid - 38 <= 27 ? `R${two(svid - 38)}` : null;
-  if (svid <= 70) return null;
-  if (svid <= 106) return svid - 70 <= 36 ? `E${two(svid - 70)}` : null;
-  if (svid <= 119) return null;
-  if (svid <= 140) return `S${two(svid - 100)}`;
-  if (svid <= 180) return svid - 140 <= 50 ? `C${two(svid - 140)}` : null;
-  if (svid <= 190) return `J${two(svid - 180)}`;
-  if (svid <= 197) return svid - 190 <= 14 ? `I${two(svid - 190)}` : null;
-  if (svid <= 215) return `S${two(svid - 157)}`;
-  if (svid <= 222) return svid - 208 <= 14 ? `I${two(svid - 208)}` : null;
-  if (svid <= 245) return svid - 182 <= 50 ? `C${two(svid - 182)}` : null;
-  return null;
-}
-
 // src/sbf/nav.ts
 var PI = Math.PI;
 var GPS_EPOCH_MS = Date.UTC(1980, 0, 6);
@@ -924,6 +879,80 @@ function parseSbfGloNav(data) {
   return { ephemerides, badCrc, messages };
 }
 
+// src/sbf/rawnav-bds-cnav.ts
+var GPS_BDT_OFFSET = 14;
+var B1C_FRAME_S = 18;
+var TOW_DNU2 = 4294967295;
+function newBdsCnavAssemblers() {
+  return {
+    b1c: new BdsCnav1Assembler(),
+    b2a: new BdsCnav2Assembler(),
+    b2b: new BdsCnav3Assembler()
+  };
+}
+function navBits(view, wordsAt, start, nBits) {
+  const out = new Uint8Array(Math.ceil(nBits / 8));
+  for (let i = 0; i < nBits; i++) {
+    const p = start + i;
+    const w = view.getUint32(wordsAt + 4 * (p >>> 5), true);
+    if (w >>> 31 - (p & 31) & 1) out[i >> 3] |= 128 >> (i & 7);
+  }
+  return out;
+}
+var MIN_LEN = { 4218: 248, 4219: 92, 4242: 144 };
+function feedBdsCnavBlock(view, b, id, len, asm) {
+  if (len < (MIN_LEN[id] ?? Infinity)) return {};
+  const prnStr = svidToPrn(view.getUint8(b + 14));
+  if (!prnStr || prnStr[0] !== "C") return {};
+  const prn = Number(prnStr.slice(1));
+  const words = b + 20;
+  if (id === 4218) {
+    const towMs = view.getUint32(b + 8, true);
+    if (towMs === TOW_DNU2) return {};
+    const sf2 = navBits(view, words, 72, 600);
+    const sf3 = navBits(view, words, 1272, 264);
+    const sf2Ok = bdsCnav1Sf2CrcOk(sf2);
+    const bdt = (towMs / 1e3 - GPS_BDT_OFFSET + 604800) % 604800;
+    const tTm = (Math.floor(bdt) - B1C_FRAME_S + 604800) % 604800;
+    const eph = asm.b1c.push(
+      prn,
+      sf2Ok ? sf2 : null,
+      bdsCnav1Sf3CrcOk(sf3) ? sf3 : null,
+      tTm
+    );
+    if (!sf2Ok) return { badCrc: true };
+    return eph ? { eph } : {};
+  }
+  if (id === 4219) {
+    const msg = navBits(view, words, 0, 288);
+    if (!bdsCnav2CrcOk(msg)) return { badCrc: true };
+    const eph = asm.b2a.push(msg);
+    return eph ? { eph } : {};
+  }
+  if (id === 4242) {
+    const msg = navBits(view, words, 12, 486);
+    if (!bdsCnav3CrcOk(msg)) return { badCrc: true };
+    const eph = asm.b2b.push(prn, msg);
+    return eph ? { eph } : {};
+  }
+  return {};
+}
+function parseSbfBdsCnav(data) {
+  const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
+  const asm = newBdsCnavAssemblers();
+  const ephemerides = [];
+  let badCrc = 0;
+  let messages = 0;
+  scanSbfFrames(data, view, (id, b, len) => {
+    if (id !== 4218 && id !== 4219 && id !== 4242) return;
+    messages++;
+    const r = feedBdsCnavBlock(view, b, id, len, asm);
+    if (r.eph) ephemerides.push(r.eph);
+    else if (r.badCrc) badCrc++;
+  });
+  return { ephemerides, badCrc, messages };
+}
+
 // src/navbits/sbas-l5.ts
 var SBAS_L5_PREAMBLE_UW = 6056250;
 function isSbasL1Preamble(msg) {
@@ -1066,6 +1095,7 @@ function decodeSbfNavigation(data, opts = {}) {
   const ephemerides = [];
   const seen = /* @__PURE__ */ new Set();
   const cnav = [];
+  const bdsCnav = [];
   const ionoCorrections = {};
   let leapSeconds = null;
   const counts = {
@@ -1075,6 +1105,7 @@ function decodeSbfNavigation(data, opts = {}) {
     galRaw: 0,
     gloRaw: 0,
     bdsRaw: 0,
+    bdsCnavRaw: 0,
     sbasRaw: 0,
     sbasL5Raw: 0,
     navicRaw: 0,
@@ -1086,6 +1117,7 @@ function decodeSbfNavigation(data, opts = {}) {
   const galAsm = newGalAssemblers();
   const gloAsm = new GloStringAssembler();
   const bdsAsm = new BdsAssembler();
+  const bdsCnavAsm = newBdsCnavAssemblers();
   const lnavAsm = new GpsLnavAssembler();
   const navicAsm = new NavicAssembler();
   const addEph = (e) => {
@@ -1192,6 +1224,17 @@ function decodeSbfNavigation(data, opts = {}) {
         else if (r.badCrc) counts.badFrames++;
         return;
       }
+      case 4218:
+      // BDSRawB1C
+      case 4219:
+      // BDSRawB2a
+      case 4242: {
+        counts.bdsCnavRaw++;
+        const r = feedBdsCnavBlock(view, b, id, len, bdsCnavAsm);
+        if (r.eph) bdsCnav.push(r.eph);
+        else if (r.badCrc) counts.badFrames++;
+        return;
+      }
       case 4020: {
         if (len < 52) return;
         counts.sbasRaw++;
@@ -1248,7 +1291,15 @@ function decodeSbfNavigation(data, opts = {}) {
     prns: [...dfmcPrns].sort(),
     messages: Object.values(dfmcByType).reduce((a, v) => a + v, 0)
   };
-  return { ephemerides, cnav, ionoCorrections, leapSeconds, dfmc, counts };
+  return {
+    ephemerides,
+    cnav,
+    bdsCnav,
+    ionoCorrections,
+    leapSeconds,
+    dfmc,
+    counts
+  };
 }
 
 // src/navbits/rs255.ts
@@ -1876,23 +1927,23 @@ var MEAS2_SIG = [
   ["J", "1E"],
   ["J", "5P"]
 ];
-var two2 = (n) => String(n).padStart(2, "0");
+var two = (n) => String(n).padStart(2, "0");
 function m3Prn(navsys, svid) {
   switch (navsys) {
     case 0:
-      return svid < 32 ? `G${two2(svid + 1)}` : null;
+      return svid < 32 ? `G${two(svid + 1)}` : null;
     case 1:
-      return svid < 27 ? `R${two2(svid + 1)}` : null;
+      return svid < 27 ? `R${two(svid + 1)}` : null;
     case 2:
-      return svid < 36 ? `E${two2(svid + 1)}` : null;
+      return svid < 36 ? `E${two(svid + 1)}` : null;
     case 3:
-      return svid < 50 ? `C${two2(svid + 1)}` : null;
+      return svid < 50 ? `C${two(svid + 1)}` : null;
     case 4:
-      return svid <= 38 ? `S${two2(svid + 20)}` : null;
+      return svid <= 38 ? `S${two(svid + 20)}` : null;
     case 5:
-      return svid < 10 ? `J${two2(svid + 1)}` : null;
+      return svid < 10 ? `J${two(svid + 1)}` : null;
     case 6:
-      return svid < 14 ? `I${two2(svid + 1)}` : null;
+      return svid < 14 ? `I${two(svid + 1)}` : null;
     default:
       return null;
   }
@@ -2443,8 +2494,6 @@ function parseSbfMeas(data) {
 }
 
 export {
-  crc16,
-  scanSbfFrames,
   parseSbfNav,
   parseSbfAlmanac,
   parseSbfIonoUtc,
@@ -2458,6 +2507,7 @@ export {
   parseSbfGalNav,
   parseSbfBdsNav,
   parseSbfGloNav,
+  parseSbfBdsCnav,
   SBAS_L5_PREAMBLE_UW,
   isSbasL1Preamble,
   sbasL5MessageType,

package/dist/{chunk-KUSUN7DP.js → chunk-MFCPYUEI.js}

@@ -1,6 +1,6 @@
 import {
   parseRinexStream
-} from "./chunk-3U5AX7PY.js";
+} from "./chunk-FEABDV5P.js";
 import {
   ARC_GAP_FACTOR,
   BAND_LABELS,