Changeset 11192 in ntrip for trunk/BNC/src/rinex/rnxnavfile.cpp

Timestamp:

Nov 10, 2026, 12:13:23 PM (less than one hour ago)

Author:

stuerze

Message:

rinex version 4.02 now fully supported

File:

• trunk/BNC/src/rinex/rnxnavfile.cpp (modified) (4 diffs)

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -152 +152 @@
   QString navType;
   QString prn;
+  bool    ephPending = false; // RINEX 4: "> EPH" line read, data lines follow
 
   while (stream->status() == QTextStream::Ok && !stream->atEnd()) {
-    char sys;
+    char sys = 0;
     QString line = stream->readLine();
     if (line.isEmpty()) {
@@ -176 +177 @@
       navType = "";
     }
-    // RINEX version 4
+    // RINEX version 4: data lines of an EPH record follow its "> EPH" line;
+    // anything else (e.g. the remainder of a record that could not be read)
+    // is skipped
+    else if (version() >= 4.0 && firstStr != ">") {
+      if (!ephPending || line.left(1) != prn.left(1)) {
+        ephPending = false;
+        continue;
+      }
+      ephPending = false;
+      sys = prn[0].toLatin1();
+    }
     else if (version() >= 4.0 && firstStr == ">") {
+      ephPending = false;
+      if (hlp.size() < 4) {
+        continue;
+      }
       QString key = hlp.at(1);
       prn = hlp.at(2);
       sys = prn[0].toLatin1();
       navType = hlp.at(3);
+      ephPending = (key == "EPH");
 
       // ALL Non-EPH messages are currently ignored
@@ -206 +222 @@
           if ((sys == 'I' && navType == "L1NV") || // I: KLOB, NEQN
               (sys == 'J' && navType == "CNVX")) { // J: WIDE, JAPN
-            QString navSubType = hlp.at(4);
+            QString navSubType = hlp.value(4); // RINEX >= 4.02 only
             if      (navSubType == "KLOB") {
               lines2skip += 1;
@@ -244 +260 @@
       if (version() >= 3.05) {
         nLines += 1;
+      }
+      if (navType == "L1OC" || navType == "L3OC") {
+        nLines = 9;
       }
       for (int ii = 1; ii < nLines; ii++) {