Changeset 8855 in ntrip for branches/BNC_2.12

Timestamp:

Nov 21, 2019, 10:47:25 AM (4 years ago)

Author:

stuerze

Message:

changes regarding fit interval for GPS and QZSS completed

Location:

branches/BNC_2.12/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (2 diffs)
• bncutils.cpp (modified) (3 diffs)
• bncutils.h (modified) (1 diff)

branches/BNC_2.12/src/RTCM3/RTCM3Decoder.cpp

@@ -1082 +1082 @@
     GETBITS(eph._L2PFlag, 1)
     GETBITS(fitIntervalFalg, 1)
-    if (fitIntervalFalg == 0) {
-      eph._fitInterval = 4.0;
-    }
+    eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.type());
     eph._TOT = 0.9999e9;
 
@@ -1247 +1245 @@
     GETBITS(eph._IODC, 10)
     GETBITS(fitIntervalFalg, 1)
-    if (fitIntervalFalg == 0) {
-      eph._fitInterval = 2.0;
-    }
+    eph._fitInterval = fitIntervalFromFlag(fitIntervalFalg, eph._IODC, eph.type());
     eph._TOT = 0.9999e9;
 

branches/BNC_2.12/src/bncutils.cpp

@@ -807 +807 @@
 }
 
+//
+////////////////////////////////////////////////////////////////////////////
 double accuracyFromIndex(int index, t_eph::e_type type) {
 double accuracy = -1.0;
@@ -868 +870 @@
 }
 
-
+//
+////////////////////////////////////////////////////////////////////////////
 int indexFromAccuracy(double accuracy, t_eph::e_type type) {
 
@@ -944 +947 @@
 
   return (type == t_eph::Galileo) ? 255 : 15;
+}
+
+// Returns fit interval in hours from flag
+////////////////////////////////////////////////////////////////////////////
+double fitIntervalFromFlag(int flag, double iodc, t_eph::e_type type) {
+  double fitInterval = 0.0;
+
+  switch (flag) {
+    case 0:
+      if      (type == t_eph::GPS) {
+        fitInterval = 4.0;
+      }
+      else if (type == t_eph::QZSS) {
+        fitInterval = 2.0;
+      }
+      break;
+    case 1:
+      if (type == t_eph::GPS) {
+        if      (iodc >= 240 && iodc <= 247) {
+          fitInterval =  8.0;
+        }
+        else if ((iodc >= 248 && iodc <= 255) ||
+                 (iodc == 496) ) {
+          fitInterval = 14.0;
+        }
+        else if ((iodc >=  497 && iodc <=  503) ||
+                 (iodc >= 2021 && iodc <= 1023) ) {
+          fitInterval = 26.0;
+        }
+        else {
+          fitInterval =  6.0;
+        }
+      }
+      break;
+  }
+  return fitInterval;
 }
 

branches/BNC_2.12/src/bncutils.h

@@ -137 +137 @@
 
 int          indexFromAccuracy(double accuracy, t_eph::e_type type);
+
+double       fitIntervalFromFlag(int flag, double iodc, t_eph::e_type type);
 
 double       associatedLegendreFunction(int n, int m, double t);