Changeset 8925 in ntrip for trunk/BNC

Timestamp:

Apr 30, 2020, 8:11:54 AM (4 years ago)

Author:

stuerze

Message:

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

Location:

trunk/BNC/src

Files:

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

trunk/BNC/src/ephemeris.cpp

@@ -301 +301 @@
         return;
       }
-      readDbl(line, pos[1], fieldLen, _fitInterval); // _fitInterval optional
+      // 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);
+      }
     }
   }
@@ -478 +484 @@
   }
   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) {
+      (_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(' '));
   }
 

trunk/BNC/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)
 };