Changeset 10330 in ntrip for trunk/BNC

Timestamp:

Feb 13, 2024, 11:51:53 AM (10 months ago)

Author:

stuerze

Message:

another test is added in PPP and combination mode to check if stored ephemerides were outdated and/or not updated in between

Location:

trunk/BNC/src

Files:

• PPP/pppEphPool.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (1 diff)
• bncutils.cpp (modified) (2 diffs)
• bncutils.h (modified) (1 diff)
• combination/bnccomb.cpp (modified) (3 diffs)
• upload/bncrtnetuploadcaster.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppEphPool.cpp

@@ -121 +121 @@
 
   for (unsigned ii = 0; ii < _ephs.size(); ii++) {
-    t_eph* eph = _ephs[ii];
+    const t_eph* eph = _ephs[ii];
     t_irc irc = eph->getCrd(tt, xc, vv, OPT->useOrbClkCorr());
     if (irc == success) {
-      if (eph->prn().system() == 'R') {
-        double age = tt - eph->TOC();
-        if (fabs(age) > 3600.0) {
+        if (outDatedBcep(eph, tt)) {
           continue;
-        }
       }
       return irc;

trunk/BNC/src/bncephuser.cpp

@@ -194 +194 @@
   // --------------------------------------------------------
   if (realTime) {
-    if (outDatedBcep(eph)) {
+    QDateTime now = currentDateAndTimeGPS();
+    bncTime   currentTime(now.toString(Qt::ISODate).toStdString());
+    if (outDatedBcep(eph, currentTime)) {
       eph->setCheckState(t_eph::outdated);
       return;

trunk/BNC/src/bncutils.cpp

@@ -265 +265 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-bool outDatedBcep(const t_eph *eph) {
+bool outDatedBcep(const t_eph *eph, bncTime tt) {
   bncTime   toc = eph->TOC();
-  QDateTime now = currentDateAndTimeGPS();
-  bncTime currentTime(now.toString(Qt::ISODate).toStdString());
-  double dt = currentTime - toc;
+  double dt = tt -toc;
 
   // update interval: 2h, data sets are valid for 4 hours
@@ -280 +278 @@
   }
   // updated every 30 minutes + 5 min
-  else if (eph->type() == t_eph::GLONASS && (dt >  3900.0 || dt < -2100.0)) {
+  else if (eph->type() == t_eph::GLONASS && (dt >  2100.0 || dt < -2100.0)) {
     return true;
   }

trunk/BNC/src/bncutils.h

@@ -76 +76 @@
 bool         checkForWrongObsEpoch(bncTime obsEpoch);
 
-bool         outDatedBcep(const t_eph *eph);
+bool         outDatedBcep(const t_eph *eph, bncTime tt);
 
 QByteArray   ggaString(const QByteArray& latitude, const QByteArray& longitude,

trunk/BNC/src/combination/bnccomb.cpp

@@ -638 +638 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncComb::processEpoch(bncTime epoTime, const vector<t_clkCorr>& clkCorrVec) {
-
+  QDateTime now = currentDateAndTimeGPS();
+  bncTime   currentTime(now.toString(Qt::ISODate).toStdString());
   for (unsigned ii = 0; ii < clkCorrVec.size(); ii++) {
     const t_clkCorr& clkCorr = clkCorrVec[ii];
@@ -698 +699 @@
       continue;
     }
-    else if (ephLast->checkState() == t_eph::bad ||
+    else if (outDatedBcep(ephLast, currentTime)  ||
+             ephLast->checkState() == t_eph::bad ||
              ephLast->checkState() == t_eph::outdated ||
              ephLast->checkState() == t_eph::unhealthy) {
@@ -711 +713 @@
         _newCorr->_eph = ephLast;
       }
-      else if (ephPrev && ephPrev->checkState() == t_eph::ok &&
+      else if (ephPrev &&
+               !outDatedBcep(ephPrev, currentTime) &&  // if not updated in storage
+               ephPrev->checkState() == t_eph::ok  &&  // received
                ephPrev->IOD() == _newCorr->_iod) {
         _newCorr->_eph = ephPrev;

trunk/BNC/src/upload/bncrtnetuploadcaster.cpp

@@ -543 +543 @@
     }
 
+    QDateTime now = currentDateAndTimeGPS();
+    bncTime   currentTime(now.toString(Qt::ISODate).toStdString());
     if (eph &&
-        !outDatedBcep(eph)                    &&  // detected from storage because of no update
+        !outDatedBcep(eph, currentTime)       &&  // detected from storage because of no update
         eph->checkState() != t_eph::bad       &&
         eph->checkState() != t_eph::unhealthy &&