Changeset 8930 in ntrip for branches

Timestamp:

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

Author:

stuerze

Message:

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

File:

• branches/BNC_2.12/src/ephemeris.cpp (modified) (3 diffs)

branches/BNC_2.12/src/ephemeris.cpp

@@ -298 +298 @@
       }
     }
-
     else if ( iLine == 7 ) {
       if ( readDbl(line, pos[0], fieldLen, _TOT) ) {
@@ -487 +486 @@
   }
   // fitInterval
-  if (type() == t_eph::IRNSS) {            // not valid for IRNSS
+  if (type() == t_eph::IRNSS) {// not valid for IRNSS
     out << QString(fmt)
       .arg(tot,          19, 'e', 12)
@@ -495 +494 @@
   }
   else {
-    double fitIntervalRnx = _fitInterval; // specified as time period in hours for GPS since RINEX 3.03
-    if      (type() == t_eph::GPS && version < 3.03) { // specified as flag in versions < 3.03
-      (_fitInterval == 4.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
-    }
-    else 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;
     }