Changeset 7208 in ntrip

Timestamp:

Aug 17, 2015, 2:34:40 PM (9 years ago)

Author:

stuerze

Message:

minor changes to decide between erroneous and outdated ephemerides during the ephemeris check

Location:

trunk/BNC/src

Files:

• bnccore.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (7 diffs)
• ephemeris.h (modified) (1 diff)
• rinex/rnxnavfile.cpp (modified) (1 diff)

trunk/BNC/src/bnccore.cpp

@@ -208 +208 @@
   QMutexLocker locker(&_mutex);
   t_irc ircPut = _ephUser.putNewEph(eph, true);
-  if (eph->checkState() == t_eph::bad) {
+  if      (eph->checkState() == t_eph::bad) {
     messagePrivate("WRONG EPHEMERIS\n" + eph->toString(3.0).toAscii());
+    return failure;
+  }
+  else if (eph->checkState() == t_eph::outdated) {
+    messagePrivate("OUTDATED EPHEMERIS\n" + eph->toString(3.0).toAscii());
     return failure;
   }

trunk/BNC/src/bncephuser.cpp

@@ -154 +154 @@
   const t_eph* ephOld = ephLast(prn);
 
-  if (ephOld && ephOld->checkState() == t_eph::bad) {
+  if (ephOld &&
+      (ephOld->checkState() == t_eph::bad ||
+       ephOld->checkState() == t_eph::outdated)) {
     ephOld = 0;
   }
   
   if ((ephOld == 0 || newEph->isNewerThan(ephOld)) &&
-      eph->checkState() != t_eph::bad) {
+      (eph->checkState() != t_eph::bad ||
+       eph->checkState() != t_eph::outdated)) {
     deque<t_eph*>& qq = _eph[prn];
     qq.push_back(newEph);
@@ -210 +213 @@
   if      (eph->type() == t_eph::GPS  || t_eph::Galileo) {
     if (timeDiff > 4*3600) { // update interval: 2h, data sets are valid for 4 hours
-      eph->setCheckState(t_eph::bad);
+      eph->setCheckState(t_eph::outdated);
       return;
     }
@@ -216 +219 @@
   else if (eph->type() == t_eph::GLONASS) {
     if (timeDiff > 1*3600) { // updated every 30 minutes
-      eph->setCheckState(t_eph::bad);
+      eph->setCheckState(t_eph::outdated);
       return;
     }
@@ -222 +225 @@
   else if (eph->type() == t_eph::QZSS) {
     if (timeDiff > 1*1800) {
-      eph->setCheckState(t_eph::bad);
+      eph->setCheckState(t_eph::outdated);
       return;
     }
@@ -228 +231 @@
   else if (eph->type() == t_eph::SBAS) {
     if (timeDiff > 600) { // maximum update interval: 300 sec
-      eph->setCheckState(t_eph::bad);
+      eph->setCheckState(t_eph::outdated);
       return;
     }
@@ -234 +237 @@
   else if (eph->type() == t_eph::BDS) {
     if (timeDiff > 6*3600) { // updates 1 (GEO) up to 6 hours
-      eph->setCheckState(t_eph::bad);
+      eph->setCheckState(t_eph::outdated);
       return;
     }
@@ -256 +259 @@
     if      ((eph->type() == t_eph::GPS ||
               eph->type() == t_eph::Galileo)  && dt > 4*3600) {
-      ephL->setCheckState(t_eph::bad);
+      ephL->setCheckState(t_eph::outdated);
       return;
     }
     else if ((eph->type() == t_eph::GLONASS ||
               eph->type() == t_eph::QZSS)     && dt > 2*3600) {
-      ephL->setCheckState(t_eph::bad);
+      ephL->setCheckState(t_eph::outdated);
       return;
     }
     else if  (eph->type() == t_eph::SBAS      && dt > 1*3600)   {
-      ephL->setCheckState(t_eph::bad);
+      ephL->setCheckState(t_eph::outdated);
       return;
     }
     else if  (eph->type() == t_eph::BDS       && dt > 6*3600)   {
-      ephL->setCheckState(t_eph::bad);
+      ephL->setCheckState(t_eph::outdated);
       return;
     }

trunk/BNC/src/ephemeris.h

@@ -18 +18 @@
  public:
   enum e_type {unknown, GPS, QZSS, GLONASS, Galileo, SBAS, BDS};
-  enum e_checkState {unchecked, ok, bad};
+  enum e_checkState {unchecked, ok, bad, outdated};
 
   t_eph();

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -200 +200 @@
       eph = new t_ephBDS(version(), lines);
     }
-    if (eph && eph->checkState() != t_eph::bad) {
+    if (eph &&
+        eph->checkState() != t_eph::bad &&
+        eph->checkState() != t_eph::outdated) {
       _ephs.push_back(eph);
     }