Changeset 8927 in ntrip for trunk

Timestamp:

Apr 30, 2020, 8:47:35 AM (4 years ago)

Author:

stuerze

Message:

bug fixed: RINEX 3.04 QZSS fit interval is specified as flag

File:

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

trunk/BNC/src/ephemeris.cpp

@@ -295 +295 @@
       }
     }
-
     else if ( iLine == 7 ) {
       if ( readDbl(line, pos[0], fieldLen, _TOT) ) {
@@ -301 +300 @@
         return;
       }
-      // Rinex 3.04: fitInterval is specified as time period for GPS,
-      //             as flag for QZSS and not valid for IRNSS
-      double fitIntervalRnx;
-      readDbl(line, pos[1], fieldLen, fitIntervalRnx);
-      if (type() == t_eph::QZSS) {
-        _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
+      // 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;
+        } else if (type() == t_eph::QZSS) { // specified as flag for QZSS
+          _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
+        }
       }
     }
@@ -476 +479 @@
     tot = 0.0;
   }
-  if (type() == t_eph::IRNSS) {
+  // fitInterval
+  if (type() == t_eph::IRNSS) {           // not valid for IRNSS
     out << QString(fmt)
       .arg(tot,          19, 'e', 12)
@@ -484 +488 @@
   }
   else {
-    // Rinex 3.04: fitInterval is specified as flag for QZSS
-    //             but as time period for GPS
-    double fitIntervalRnx = _fitInterval; // GPS
-    if (type() == t_eph::QZSS) {
+    // Rinex 3.04:
+    double fitIntervalRnx = _fitInterval; // specified as time period in hours for GPS
+    if (type() == t_eph::QZSS) {          // specified as flag for QZSS
       (_fitInterval == 2.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
     }