Changeset 9789 in ntrip for trunk/BNC/src/ephemeris.cpp

Timestamp:

Jul 13, 2022, 2:24:35 PM (22 months ago)

Author:

stuerze

Message:

some more changes to consider RINEX Version 4 nav file (EPH key only)

File:

• trunk/BNC/src/ephemeris.cpp (modified) (9 diffs)

trunk/BNC/src/ephemeris.cpp

@@ -2065 +2065 @@
       }
       else if (navType() == t_eph::CNV3) {
+        double health;
         if ( readDbl(line, pos[0], fieldLen, _SISMAI        ) ||
-             readDbl(line, pos[1], fieldLen, _health        ) ||
+             readDbl(line, pos[1], fieldLen,  health        ) ||
              readDbl(line, pos[2], fieldLen, _INTEGRITYF_B2b) ||
              readDbl(line, pos[3], fieldLen, _TGD_B2bI)     )  {
@@ -2072 +2073 @@
           return;
         }
+        _health = int(health);
       }
       else { // D1, D2 or undefined
@@ -2090 +2092 @@
     // =====================
     else if ( iLine == 8 ) {
-
+      double health;
       if      (navType() == t_eph::CNV1) {
         if ( readDbl(line, pos[0], fieldLen, _SISMAI        ) ||
-             readDbl(line, pos[1], fieldLen, _health        ) ||
+             readDbl(line, pos[1], fieldLen,  health        ) ||
              readDbl(line, pos[2], fieldLen, _INTEGRITYF_B1C) ||
              readDbl(line, pos[3], fieldLen, _IODC)     )  {
@@ -2099 +2101 @@
           return;
         }
+        _health = int(health);
       }
       else if (navType() == t_eph::CNV2) {
         if ( readDbl(line, pos[0], fieldLen, _SISMAI           ) ||
-             readDbl(line, pos[1], fieldLen, _health           ) ||
+             readDbl(line, pos[1], fieldLen,  health           ) ||
              readDbl(line, pos[2], fieldLen, _INTEGRITYF_B2aB1C) ||
              readDbl(line, pos[3], fieldLen, _IODC)            )  {
@@ -2108 +2111 @@
           return;
         }
+        _health = int(health);
       }
       else if (navType() == t_eph::CNV3) {
@@ -2313 +2317 @@
 }
 
+
+// Health status of SBAS Ephemeris (virtual)
+////////////////////////////////////////////////////////////////////////////
+unsigned int t_ephBDS::isUnhealthy() const {
+
+  if (navType() == t_eph::CNV1 ||
+      navType() == t_eph::CNV2 ||
+      navType() == t_eph::CNV3) {
+    return static_cast<unsigned int>(_health);
+  }
+
+  return static_cast<unsigned int>(_SatH1);
+
+}
+
+
 // RINEX Format String
 //////////////////////////////////////////////////////////////////////////////
@@ -2418 +2438 @@
     out << QString(fmt)
       .arg(_SISMAI,         19, 'e', 12)
-      .arg(_health,         19, 'e', 12)
+      .arg(double(_health), 19, 'e', 12)
       .arg(_INTEGRITYF_B2b, 19, 'e', 12)
       .arg(_TGD_B2bI,       19, 'e', 12);
@@ -2443 +2463 @@
     out << QString(fmt)
       .arg(_SISMAI,         19, 'e', 12)
-      .arg(_health,         19, 'e', 12)
+      .arg(double(_health), 19, 'e', 12)
       .arg(_INTEGRITYF_B1C, 19, 'e', 12)
       .arg(_IODC,           19, 'e', 12);
@@ -2450 +2470 @@
     out << QString(fmt)
       .arg(_SISMAI,            19, 'e', 12)
-      .arg(_health,            19, 'e', 12)
+      .arg(double(_health),    19, 'e', 12)
       .arg(_INTEGRITYF_B2aB1C, 19, 'e', 12)
       .arg(_IODC,              19, 'e', 12);