Changeset 8012 in ntrip for branches

Timestamp:

Aug 12, 2016, 5:37:37 PM (8 years ago)

Author:

stuerze

Message:

check regarding wrong observation epochs is done in latencychecker as well to prevent erroneous latencies

Location:

branches/BNC_2.12/src

Files:

• bncgetthread.cpp (modified) (2 diffs)
• bncutils.cpp (modified) (1 diff)
• bncutils.h (modified) (1 diff)
• latencychecker.cpp (modified) (1 diff)

branches/BNC_2.12/src/bncgetthread.cpp

@@ -537 +537 @@
         const t_satObs& obs = it.next();
 
-        QString prn(obs._prn.toString().c_str());
-        long iSec    = long(floor(obs._time.gpssec()+0.5));
-        long obsTime = obs._time.gpsw()*7*24*3600 + iSec;
-
         // Check observation epoch
         // -----------------------
         if (!_rawFile) {
-          int    week;
-          double sec;
-          currentGPSWeeks(week, sec);
-          long currTime = week * 7*24*3600 + long(sec);
-          const double maxDt = 600.0;
-          if (fabs(currTime - obsTime) > maxDt) {
-              emit( newMessage(_staID + ": Wrong observation epoch(s)", false) );
+          bool wrongObservationEpoch = checkForWrongObsEpoch(obs._time);
+          if (wrongObservationEpoch) {
+            emit( newMessage(_staID + ": Wrong observation epoch(s)", false) );
             continue;
           }
@@ -558 +550 @@
         // ----------------------------------------------------
         if (!_rawFile) {
+          QString prn(obs._prn.toString().c_str());
+          long iSec    = long(floor(obs._time.gpssec()+0.5));
+          long obsTime = obs._time.gpsw()*7*24*3600 + iSec;
           QMap<QString, long>::const_iterator it = _prnLastEpo.find(prn);
           if (it != _prnLastEpo.end()) {

branches/BNC_2.12/src/bncutils.cpp

@@ -249 +249 @@
 //
 ////////////////////////////////////////////////////////////////////////////
+bool checkForWrongObsEpoch(bncTime obsEpoch) {
+  const double maxDt = 600.0;
+  long iSec    = long(floor(obsEpoch.gpssec()+0.5));
+  long obsTime = obsEpoch.gpsw()*7*24*3600 + iSec;
+  int    week;
+  double sec;
+  currentGPSWeeks(week, sec);
+  long currTime = week * 7*24*3600 + long(sec);
+
+  if (fabs(currTime - obsTime) > maxDt) {
+    return true;
+  }
+  return false;
+}
+//
+////////////////////////////////////////////////////////////////////////////
 QByteArray ggaString(const QByteArray& latitude,
                      const QByteArray& longitude,

branches/BNC_2.12/src/bncutils.h

@@ -62 +62 @@
 
 QDateTime    currentDateAndTimeGPS();
+
+bool         checkForWrongObsEpoch(bncTime obsEpoch);
 
 QByteArray   ggaString(const QByteArray& latitude, const QByteArray& longitude,

branches/BNC_2.12/src/latencychecker.cpp

@@ -336 +336 @@
     while (it.hasNext()) {
       const t_satObs& obs = it.next();
-      
+      bool wrongObservationEpoch = checkForWrongObsEpoch(obs._time);
       _newSecGPS = static_cast<int>(obs._time.gpssec());
-      if (_newSecGPS != _oldSecGPS) {
+      if (_newSecGPS != _oldSecGPS && !wrongObservationEpoch) {
         if (_newSecGPS % _miscIntr < _oldSecGPS % _miscIntr) {
           if (_numLat > 0) {