Changeset 9192 in ntrip for trunk

Timestamp:

Oct 31, 2020, 10:12:56 PM (4 years ago)

Author:

stuerze

Message:

some more ephemeris checks are added

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (9 diffs)
• bncephuser.cpp (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3Decoder.cpp

@@ -1046 +1046 @@
     GETFLOATSIGN(eph._Cus,            16, 1.0 / (double )(1 << 29))
     GETFLOAT(eph._sqrt_A,             32, 1.0 / (double )(1 << 19))
+    if (eph._sqrt_A < 1000.0) {return false;}
     GETBITS(i, 16)
     i <<= 4;
@@ -1100 +1101 @@
     GETBITS(eph._almanac_health, 1) /* almanac healthy */
     GETBITS(eph._almanac_health_availablility_indicator, 1) /* almanac health ok */
+    if (eph._almanac_health_availablility_indicator == 0.0) {return false;}
     GETBITS(eph._P1, 2) /*  P1 */
     GETBITS(i, 5)
@@ -1135 +1137 @@
     GETBITS(eph._M_FT,  4) /* GLONASS-M Ft */
     GETBITS(eph._M_NT, 11) /* GLONASS-M Nt */
+    if (eph._M_NT == 0.0) {return false;}
     GETBITS(eph._M_M,   2) /* GLONASS-M M */
     GETBITS(eph._additional_data_availability, 1) /* GLONASS-M The Availability of Additional Data */
+    if (eph._additional_data_availability == 0.0) {return false;}
     GETBITS(eph._NA,  11) /* GLONASS-M Na */
     GETFLOATSIGNM(eph._tauC,       32, 1.0/(double)(1<<30)/(double)(1<<1)) /* GLONASS tau c */
@@ -1199 +1203 @@
     GETFLOATSIGN(eph._Cus,     16, 1.0 / (double )(1 << 29))
     GETFLOAT(eph._sqrt_A,      32, 1.0 / (double )(1 << 19))
+    if (eph._sqrt_A < 1000.0) {return false;}
     GETBITS(i, 16)
     i <<= 4;
@@ -1307 +1312 @@
     GETFLOAT(eph._e,            32, 1.0 / (double )(1 << 30) / (double )(1 << 3))
     GETFLOAT(eph._sqrt_A,       32, 1.0 / (double )(1 << 19))
+    if (eph._sqrt_A < 1000.0) {return false;}
     GETFLOATSIGN(eph._OMEGA0,   32, R2R_PI/(double)(1<<30)/(double)(1<< 1))
     GETFLOATSIGN(eph._omega,    32, R2R_PI/(double)(1<<30)/(double)(1<< 1))
@@ -1404 +1410 @@
     GETFLOATSIGN(eph._Cus,            16, 1.0 / (double )(1 << 29))
     GETFLOAT(eph._sqrt_A,             32, 1.0 / (double )(1 << 19))
+    if (eph._sqrt_A < 1000.0) {return false;}
     GETBITSFACTOR(eph._TOEsec, 14, 60)
     /* FIXME: overwrite value, copied from old code */
@@ -1425 +1432 @@
       GETBITS(eph._E1_bHS, 2)
       GETBITS(eph._e1DataInValid, 1)
+      if (eph._E5bHS != eph._E1_bHS) {
+        return false;
+      }
+      if ((eph._BGD_1_5A == 0.0 && fabs(eph._BGD_1_5B) > 1e-9) ||
+          (eph._BGD_1_5B == 0.0 && fabs(eph._BGD_1_5A) > 1e-9)) {
+        return false;
+      }
     }
     else {
@@ -1484 +1498 @@
     GETFLOATSIGN(eph._Cus,     18, 1.0 / (double )(1 << 30) / (double )(1 << 1))
     GETFLOAT(eph._sqrt_A,      32, 1.0 / (double )(1 << 19))
+    if (eph._sqrt_A < 1000.0) {return false;}
     GETBITS(i, 17)
     i <<= 3;
@@ -1693 +1708 @@
           case 1045:
           case 1046:
+            // reject 1045/1046 from JAXA RTKLIB encoded stations
+            if (_staID.contains("AIRA") || _staID.contains("STK2") ||
+                _staID.contains("CCJ2") || _staID.contains("SYOG")) {
+              break;
+            }
             if (DecodeGalileoEphemeris(_Message, _BlockSize))
               decoded = true;

trunk/BNC/src/bncephuser.cpp

@@ -205 +205 @@
     return;
   }
-
   double rr = xc.Rows(1,3).NormFrobenius();
-
+  double rv = vv.NormFrobenius();
   const double MINDIST = 2.e7;
   const double MAXDIST = 6.e7;
   if (rr < MINDIST || rr > MAXDIST || std::isnan(rr)) {
+    eph->setCheckState(t_eph::bad);
+    return;
+  }
+  if (eph->type() == t_eph::GLONASS && rv < 1.0) {
     eph->setCheckState(t_eph::bad);
     return;