Changeset 8926 in ntrip

Timestamp:

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

Author:

stuerze

Message:

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

Location:

branches/BNC_2.12/src

Files:

• ephemeris.cpp (modified) (3 diffs)
• ephemeris.h (modified) (1 diff)

branches/BNC_2.12/src/ephemeris.cpp

@@ -304 +304 @@
         return;
       }
-      readDbl(line, pos[1], fieldLen, _fitInterval); // _fitInterval optional
+      // 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);
+        }
+      }
     }
   }
@@ -473 +483 @@
     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)
@@ -481 +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
+      (_fitInterval == 2.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
+    }
     out << QString(fmt)
-      .arg(tot,          19, 'e', 12)
-      .arg(_fitInterval, 19, 'e', 12)
-      .arg("",           19, QChar(' '))
-      .arg("",           19, QChar(' '));
+      .arg(tot,            19, 'e', 12)
+      .arg(fitIntervalRnx, 19, 'e', 12)
+      .arg("",             19, QChar(' '))
+      .arg("",             19, QChar(' '));
   }
 

branches/BNC_2.12/src/ephemeris.h

@@ -143 +143 @@
 
   double  _TOT;             // Transmission time
-  double  _fitInterval;     // Fit interval (not valid for IRNSS)
+  double  _fitInterval;     // Fit interval in hours (not valid for IRNSS)
 
 };