Changeset 11194 in ntrip for trunk/BNC

Timestamp:

Nov 10, 2026, 2:21:34 PM (73 minutes ago)

Author:

stuerze

Message:

IGS-SSR format checked and fixed

Location:

trunk/BNC

Files:

• src/PPP/pppEphPool.cpp (modified) (2 diffs)
• src/RTCM3/RTCM3coDecoder.cpp (modified) (7 diffs)
• src/RTCM3/RTCM3coDecoder.h (modified) (1 diff)
• src/RTCM3/clock_and_orbit/clock_orbit.h (modified) (1 diff)
• src/bncephuser.h (modified) (1 diff)
• src/combination/bnccomb.cpp (modified) (2 diffs)
• src/ephemeris.h (modified) (1 diff)
• src/pppModel.cpp (modified) (1 diff)
• src/upload/bncrtnetuploadcaster.cpp (modified) (3 diffs)
• src/upload/bncrtnetuploadcaster.h (modified) (1 diff)
• tests/cases/log_structured/expected/PPPQuickStart.jsonl.gz (modified) ( previous)
• tests/cases/log_structured/expected/PPPQuickStart.logfmt.gz (modified) ( previous)
• tests/cases/ppp_rt_quickstart/expected/BKG1DEMRTS_20253211300_01H_10S_WTZR00DEU_TRO.TRO.gz (modified) ( previous)
• tests/cases/ppp_rt_quickstart/expected/PPPQuickStart.log.gz (modified) ( previous)
• tests/cases/ppp_rt_quickstart/expected/WTZR00DEU_20253210000_01D_01S.nmea.gz (modified) ( previous)
• tests/cases/ppp_rt_quickstart/expected/WTZR00DEU_20253210000_01D_01S.ppp.gz (modified) ( previous)

trunk/BNC/src/PPP/pppEphPool.cpp

@@ -144 +144 @@
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
     t_eph* eph = _ephs[ii];
-    if (eph->IOD() == corr->_iod) {
+    if (eph->matchesSsrIOD(corr->_iod)) {
       eph->setOrbCorr(corr);
     }
@@ -165 +165 @@
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
     t_eph* eph = _ephs[ii];
-    if (eph->IOD() == corr->_iod) {
+    if (eph->matchesSsrIOD(corr->_iod)) {
       eph->setClkCorr(corr);
     }

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -375 +375 @@
       continue;
     }
+    num = satNumber(sys, num);
 
     // Orbit correction
@@ -429 +430 @@
 
       t_clkCorr clkCorr;
-      clkCorr._prn.set(sys, _clkOrb.Sat[ii].ID, flag);
+      clkCorr._prn.set(sys, num, flag);
       checkPrnRange(clkCorr._prn);
       clkCorr._staID      = _staID.toStdString();
@@ -454 +455 @@
          _clkOrb.messageType == _ssrCorr->COTYPE_SBASHR ||
          _clkOrb.messageType == _ssrCorr->COTYPE_BDSHR) {
-      t_prn prn(sys, _clkOrb.Sat[ii].ID, flag);
+      t_prn prn(sys, num, flag);
       if (_lastClkCorrections.contains(prn)) {
         t_clkCorr clkCorr;
         clkCorr            = _lastClkCorrections[prn];
+        // The polynomial keeps the reference time t0 of its clock message
+        // (IGS SSR v1.00 4.2, RTCM 10403.3): re-reference it to the t0 of
+        // the High Rate Clock message, then add the High Rate correction.
+        double t0Clk = (clkCorr._updateInt ? 0.5 * ssrUpdateInt[clkCorr._updateInt] : 0.0);
+        double t0HR  = (_clkOrb.UpdateInterval ? 0.5 * ssrUpdateInt[_clkOrb.UpdateInterval] : 0.0);
+        double dt    = (_lastTime + t0HR) - (clkCorr._time + t0Clk);
+        clkCorr._dClk      += clkCorr._dotDClk * dt + clkCorr._dotDotDClk * dt * dt;
+        clkCorr._dotDClk   += 2.0 * clkCorr._dotDotDClk * dt;
         clkCorr._time      = _lastTime;
         clkCorr._updateInt = _clkOrb.UpdateInterval;
@@ -521 +530 @@
       continue;
     }
+    num = satNumber(sys, num);
     t_satCodeBias satCodeBias;
     satCodeBias._prn.set(sys, num, flag);
@@ -614 +624 @@
       continue;
     }
+    num = satNumber(sys, num);
     t_satPhaseBias satPhaseBias;
     satPhaseBias._prn.set(sys, num, flag);
@@ -992 +1003 @@
         corrIsOutOfRange = true;
       }
-      if (coSat.Clock.DeltaA2 < -1.3421772 ||
-          coSat.Clock.DeltaA2 > +1.3421772) {
+      if (coSat.Clock.DeltaA2 < -1.34217726 ||
+          coSat.Clock.DeltaA2 > +1.34217726) {
         ssrParStr = "Clock::DeltaA2";
-        ssrParValue = QString::number(coSat.Clock.DeltaA2, 'f', 7);
+        ssrParValue = QString::number(coSat.Clock.DeltaA2, 'f', 8);
         corrIsOutOfRange = true;
       }
@@ -1368 +1379 @@
 }
 
+// Satellite number from the GNSS Satellite ID on the wire. IGS-SSR (IGS SSR
+// v1.00 IDF011): ID 0 means 64 for GPS, GLONASS and BDS; SBAS ID 1 is PRN 120
+// (RINEX S20). RTCM-SSR IDs are used as they are.
+////////////////////////////////////////////////////////////////////////////
+int RTCM3coDecoder::satNumber(char sys, int id) const {
+  if (_type == IGSssr) {
+    if (id == 0 && (sys == 'G' || sys == 'R' || sys == 'C')) {
+      return 64;
+    }
+    if (sys == 'S') {
+      return id + 19;
+    }
+  }
+  return id;
+}
+
 // Satellite numbers on the wire can exceed BNC's supported range (e.g. 6-bit
 // IDs up to 63, while t_prn supports G01-G32). They are passed on unchanged,

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -84 +84 @@
   // range (t_prn::MAXPRN_*); such satellites map to the unused index 0.
   void checkPrnRange(const t_prn& prn);
+  int  satNumber(char sys, int id) const;
   QSet<QString>                         _prnOutOfRangeLogged;
   // IGS-SSR: latest GPS/Galileo/QZSS/SBAS epoch (GPS seconds of week) of

trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h

@@ -21 +21 @@
 enum IGS_NUMBERS {
   RTCM_MESSAGE_NUMBER_IGS = 4076,
-  IGS_SSR_VERSION = 3
+  IGS_SSR_VERSION = 1   /* IDF001: 0 experimental, 1-6 version (IGS SSR v1.00) */
 };
 

trunk/BNC/src/bncephuser.h

@@ -83 +83 @@
       const std::deque<t_eph*>& qq = _eph[prn];
       for (int ii = int(qq.size()) - 1; ii >= 0; ii--) {
-        if (qq[ii]->IOD() == iod) {
+        if (qq[ii]->matchesSsrIOD(iod)) {
           return qq[ii];
         }

trunk/BNC/src/combination/bnccomb.cpp

@@ -877 +877 @@
     }
     else {
-      if      (ephLast->IOD() == _newCorr->_iod) {
+      if      (ephLast->matchesSsrIOD(_newCorr->_iod)) {
         _newCorr->_eph = ephLast;
       }
@@ -883 +883 @@
                !outDatedBcep(ephPrev, currentTime) &&  // if not updated in storage
                ephPrev->checkState() == t_eph::ok  &&  // received
-               ephPrev->IOD() == _newCorr->_iod) {
+               ephPrev->matchesSsrIOD(_newCorr->_iod)) {
         _newCorr->_eph = ephPrev;
         switchToLastEph(ephLast, _newCorr);

trunk/BNC/src/ephemeris.h

@@ -30 +30 @@
   bncTime TOC() const {return _TOC;}
   bool    isNewerThan(const t_eph* eph) const;
+  // IOD of an SSR orbit/clock correction refers to this data set. Galileo:
+  // IGS-SSR carries the 8 LSBs of IODnav (IGS SSR v1.00 IDF012), RTCM-SSR
+  // the full 10-bit IODnav (DF459) - compare the 8 LSBs (IODnav values 256
+  // apart are some days apart, never in the pool at the same time)
+  bool    matchesSsrIOD(unsigned int iod) const {
+    return (system() == Galileo) ? ((IOD() & 0xFF) == (iod & 0xFF)) : (IOD() == iod);
+  }
   bool    sameDataSet(const t_eph* eph) const {return _TOC == eph->_TOC && IOD() == eph->IOD();}
   void    setCheckState(e_checkState checkState) {_checkState = checkState;}

trunk/BNC/src/pppModel.cpp

@@ -742 +742 @@
         sphAzi);
     double vtec = vtecSingleLayerContribution(vTec->_layers[ii]);
-    stec += vtec * sin(sphEle + _psiPP);
+    // mapping to the slant: STEC = VTEC / sin(E + psi_PP) (IGS SSR v1.00
+    // 4.5.1, RTCM 10403.3), E + psi_PP being the elevation at the pierce point
+    stec += vtec / sin(sphEle + _psiPP);
   }
   return stec;

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -783 +783 @@
 
             if (biasSat) {
-                biasSat->ID = prn.number();
+                biasSat->ID = ssrSatId(prn.system(), prn.number());
                 biasSat->NumberOfCodeBiases = 0;
                 QMapIterator<QString, double> it(codeBiases);
@@ -845 +845 @@
                 phasebias.DispersiveBiasConsistencyIndicator = dispersiveBiasConsistenyIndicator;
                 phasebias.MWConsistencyIndicator = mwConsistencyIndicator;
-                phasebiasSat->ID = prn.number();
+                phasebiasSat->ID = ssrSatId(prn.system(), prn.number());
                 phasebiasSat->NumberOfPhaseBiases = 0;
                 phasebiasSat->YawAngle = pbSat.yawAngle;
@@ -1164 +1164 @@
 
     if (sd) {
-        sd->ID = prn.mid(1).toInt();
+        sd->ID = ssrSatId(prn[0].toLatin1(), prn.mid(1).toInt());
         sd->IOD = eph->IOD();
         sd->Clock.DeltaA0 = dClkA0;

trunk/BNC/src/upload/bncrtnetuploadcaster.h

@@ -37 +37 @@
     virtual ~bncRtnetUploadCaster();
 private:
+    // GNSS Satellite ID on the wire: IGS-SSR (IGS SSR v1.00 IDF011) SBAS ID 1
+    // is PRN 120 (RINEX S20); the 6-bit field keeps 64 as 0 (masked)
+    unsigned int ssrSatId(char sys, int number) const {
+      return (_ssrFormat == "IGS-SSR" && sys == 'S') ? unsigned(number - 19) : unsigned(number);
+    }
     t_irc processSatellite(const t_eph* eph, int GPSweek,
         double GPSweeks, const QString& prn,