Changeset 11009 in ntrip

Timestamp:

Sep 9, 2026, 12:08:46 PM (5 hours ago)

Author:

stuerze

Message:

updates regarding RTCM-SSR: metadata usage in PPP, if available

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (2 diffs)
• PPP/pppClient.h (modified) (1 diff)
• PPP/pppObsPool.cpp (modified) (3 diffs)
• PPP/pppObsPool.h (modified) (3 diffs)
• pppRun.cpp (modified) (3 diffs)
• pppRun.h (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -112 +112 @@
 void t_pppClient::putTec(const t_vTec* vTec) {
   _obsPool->putTec(new t_vTec(*vTec));
+}
+
+//
+//////////////////////////////////////////////////////////////////////////////
+void t_pppClient::putMetaData(const t_metaData* metaData) {
+  _obsPool->putMetaData(new t_metaData(*metaData));
 }
 
@@ -457 +463 @@
   // Tides
   // -----
-  station->setTideDsplEarth(_tides->earth(time, station->xyzApr()));
+  // SSR Metadata (model correction type 3 = solid earth tides) tells us
+  // whether - and with which model - the correction stream's generation
+  // system already accounted for solid earth tides. To stay consistent with
+  // the orbit/clock corrections, mirror that choice here: skip our own
+  // correction if the provider applied none, apply our default model if the
+  // provider used its own default, and fall back to our default (with a
+  // warning) if the provider used some other, unsupported model - we have no
+  // way to reproduce an unknown model exactly. Absent any Metadata message
+  // (e.g. RTNET or older streams), keep today's unconditional behavior.
+  bool applyEarthTide = true;
+  const t_metaData* metaData = _obsPool->metaData();
+  if (metaData) {
+    for (unsigned ii = 0; ii < metaData->_entries.size(); ii++) {
+      const t_metaDataEntry& entry = metaData->_entries[ii];
+      if (entry._typeIndicator == 3) { // solid earth tides
+        if (!entry._applicationIndicator) {
+          applyEarthTide = false;
+        }
+        else if (entry._nonDefaultIndicator) {
+          LOG << "WARNING: SSR Metadata signals a non-default solid earth "
+              << "tide model (identifier " << entry._nonDefaultIdentifier
+              << "); applying BNC's default model anyway, results may be "
+              << "inconsistent" << endl;
+        }
+        break;
+      }
+    }
+  }
+  if (applyEarthTide) {
+    station->setTideDsplEarth(_tides->earth(time, station->xyzApr()));
+  }
+  else {
+    ColumnVector tideDsplEarth(3); tideDsplEarth = 0.0;
+    station->setTideDsplEarth(tideDsplEarth);
+  }
   station->setTideDsplOcean(_tides->ocean(time, station->xyzApr(), station->name()));
 

trunk/BNC/src/PPP/pppClient.h

@@ -28 +28 @@
   void putEphemeris(const t_eph* eph);
   void putTec(const t_vTec* vTec);
+  void putMetaData(const t_metaData* metaData);
   void putOrbCorrections(const std::vector<t_orbCorr*>& corr);
   void putClkCorrections(const std::vector<t_clkCorr*>& corr);

trunk/BNC/src/PPP/pppObsPool.cpp

@@ -52 +52 @@
   }
   _vTec = 0;
+  _metaData = 0;
 }
 
@@ -64 +65 @@
   }
   delete _vTec;
+  delete _metaData;
   while (_epochs.size() > 0) {
     delete _epochs.front();
@@ -144 +146 @@
 //
 /////////////////////////////////////////////////////////////////////////////
+void t_pppObsPool::putMetaData(t_metaData* metaData) {
+  delete _metaData;
+  _metaData = new t_metaData(*metaData);
+  delete metaData;
+}
+
+//
+/////////////////////////////////////////////////////////////////////////////
 void t_pppObsPool::putEpoch(const bncTime& epoTime, vector<t_pppSatObs*>& obsVector,
                             bool pseudoObsIono) {

trunk/BNC/src/PPP/pppObsPool.h

@@ -33 +33 @@
   void putPhaseBias(t_satPhaseBias* satPhaseBias);
   void putTec(t_vTec* _vTec);
+  void putMetaData(t_metaData* metaData);
   void clearCodeBiases(char sys);
   void clearPhaseBiases(char sys);
@@ -46 +47 @@
   }
   const t_vTec* vTec() const {return _vTec;}
+  const t_metaData* metaData() const {return _metaData;}
 
   t_epoch* lastEpoch() {
@@ -60 +62 @@
   t_satPhaseBias*          _satPhaseBiases[t_prn::MAXPRN+1];
   t_vTec*                  _vTec;
+  t_metaData*              _metaData;
   std::deque<t_epoch*>     _epochs;
 };

trunk/BNC/src/pppRun.cpp

@@ -104 +104 @@
     connect(BNC_CORE, SIGNAL(newTec(t_vTec)),
             this, SLOT(slotNewTec(t_vTec)),conType);
+
+    connect(BNC_CORE, SIGNAL(newMetaData(t_metaData)),
+            this, SLOT(slotNewMetaData(t_metaData)),conType);
 
     connect(BNC_CORE, SIGNAL(newOrbCorrections(QList<t_orbCorr>)),
@@ -467 +470 @@
 //
 ////////////////////////////////////////////////////////////////////////////
+void t_pppRun::slotNewMetaData(t_metaData metaData) {
+  if (metaData._entries.size() == 0) {
+    return;
+  }
+
+  if (_opt->_realTime) {
+    if (_opt->_corrMount.empty() || _opt->_corrMount != metaData._staID) {
+      return;
+    }
+  }
+  _pppClient->putMetaData(&metaData);
+}
+
+//
+////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotNewOrbCorrections(QList<t_orbCorr> orbCorr) {
   if (orbCorr.size() == 0) {
@@ -607 +625 @@
     connect(_corrFile, SIGNAL(newOrbCorrections(QList<t_orbCorr>)), this, SLOT(slotNewOrbCorrections(QList<t_orbCorr>)));
     connect(_corrFile, SIGNAL(newClkCorrections(QList<t_clkCorr>)), this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
+    connect(_corrFile, SIGNAL(newMetaData(t_metaData)), this, SLOT(slotNewMetaData(t_metaData)));
     if (_opt->_biasFile.empty()) {
       connect(_corrFile, SIGNAL(newCodeBiases(QList<t_satCodeBias>)), this, SLOT(slotNewCodeBiases(QList<t_satCodeBias>)));

trunk/BNC/src/pppRun.h

@@ -41 +41 @@
   void slotNewBDSEph(t_ephBDS);
   void slotNewTec(t_vTec);
+  void slotNewMetaData(t_metaData);
   void slotNewOrbCorrections(QList<t_orbCorr> orbCorr);
   void slotNewClkCorrections(QList<t_clkCorr> clkCorr);