Changeset 8931 in ntrip

Timestamp:

Apr 30, 2020, 11:08:55 AM (4 years ago)

Author:

stuerze

Message:

GPS fit intervall: different specifications in differet RINEX versions are now considerred

File:

• trunk/BNC/src/ephemeris.cpp (modified) (4 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -302 +302 @@
       // fitInterval is not valid for IRNSS
       if (type() != t_eph::IRNSS) {
-        // Rinex 3.04:
         double fitIntervalRnx;
         readDbl(line, pos[1], fieldLen, fitIntervalRnx);
-        if        (type() == t_eph::GPS) {  // specified as time period for GPS
-          _fitInterval = fitIntervalRnx;
+        if        (type() == t_eph::GPS) {
+          if (rnxVersion < 3.03) {// specified as flag for GPS
+            _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::GPS);
+          } else {                // specified as time period for GPS since 3.03
+            _fitInterval = fitIntervalRnx;
+          }
         } else if (type() == t_eph::QZSS) { // specified as flag for QZSS
           _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
@@ -314 +317 @@
   }
 }
+
 
 // Compute GPS Satellite Position (virtual)
@@ -488 +492 @@
   }
   else {
-    // Rinex 3.04:
-    double fitIntervalRnx = _fitInterval; // specified as time period in hours for GPS
-    if (type() == t_eph::QZSS) {          // specified as flag for QZSS
+    double fitIntervalRnx;
+    if      (type() == t_eph::GPS) {
+      if (version < 3.03) { // specified as flag)
+        (_fitInterval == 4.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
+      }
+      else {
+        fitIntervalRnx = _fitInterval; // specified as time period in hours
+      }
+    }
+    else if (type() == t_eph::QZSS) {    // specified as flag
       (_fitInterval == 2.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
     }
@@ -499 +510 @@
       .arg("",             19, QChar(' '));
   }
-
   return rnxStr;
 }