Changeset 9765 in ntrip for trunk/BNC/src/rinex

Timestamp:

Jun 20, 2022, 4:54:59 PM (23 months ago)

Author:

stuerze

Message:

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

Location:

trunk/BNC/src/rinex

Files:

• reqcedit.cpp (modified) (4 diffs)
• rnxnavfile.cpp (modified) (5 diffs)
• rnxnavfile.h (modified) (3 diffs)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -63 +63 @@
   _outNavFileName = settings.value("reqcOutNavFile").toString();
   int version     = settings.value("reqcRnxVersion").toInt();
-  if (version < 3) {
+  if (version == 2) {
     _rnxVersion = defaultRnxObsVersion2;
   }
-  else {
+  if (version == 3) {
     _rnxVersion = defaultRnxObsVersion3;
+  }
+  if (version == 4) {
+    _rnxVersion = defaultRnxObsVersion4;
   }
   _samplingRate   = settings.value("reqcSampling").toString().split("sec").first().toDouble();
@@ -601 +604 @@
   outNavFile.setGlonass(haveGlonass);
 
-  if ( (haveGPS && haveGlonass) || _rnxVersion >= 3.0) {
+  if (_rnxVersion < 3.0) {
+    if (haveGPS && haveGlonass) {
+      outNavFile.setVersion(defaultRnxNavVersion3);
+    }
+    if (haveGPS && !haveGlonass) {
+      outNavFile.setVersion(defaultRnxNavVersion2);
+    }
+  }
+
+  if (_rnxVersion >= 3.0 &&  _rnxVersion < 4.0) {
     outNavFile.setVersion(defaultRnxNavVersion3);
   }
-  else {
-    outNavFile.setVersion(defaultRnxNavVersion2);
+
+  if (_rnxVersion >= 4.0) {
+    outNavFile.setVersion(defaultRnxNavVersion4);
   }
 
@@ -626 +639 @@
   }
 
-  outNavFile.writeHeader(&txtMap);
+  int mergedNavFiles = _navFileNames.size();
+  unsigned year, month, day;
+  int gps_utc = 0;
+  if (_ephs.size()) {
+    _ephs.at(0)->TOC().civil_date(year, month, day);
+    gps_utc = gnumleap(year, month, day);
+  }
+  outNavFile.writeHeader(&txtMap, mergedNavFiles, gps_utc);
 
   // Loop over all ephemerides
@@ -645 +665 @@
     }
     if (eph->checkState() == t_eph::bad) {
+      continue;
+    }
+    if (outNavFile.version() >= 4.0 &&
+        eph->navType() == t_eph::undefined) { // input files < version 4.0
       continue;
     }

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -146 +146 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_rnxNavFile::read(QTextStream* stream) {
+  QString navTypeStr;
 
   while (stream->status() == QTextStream::Ok && !stream->atEnd()) {
+
     QString line = stream->readLine();
     if (line.isEmpty()) {
       continue;
     }
+
     QStringList hlp = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
+    QString firstStr = hlp.at(0);
     QString prn;
-    if (version() >= 3.0) {
-      prn = hlp.at(0);
+
+    if      (version() >= 3.0 &&  firstStr != ">") {
+      prn = firstStr;
+    }
+    else if (version() >= 4.0 && firstStr == ">") {
+      int lines2skip = 0;
+      QString key = hlp.at(1);
+      // EPH is used
+      if (key == "EPH") {
+          navTypeStr = hlp.at(3);
+      }
+      // all others are currently ignored
+      else if (key == "STO") {
+        lines2skip = 2;
+      }
+      else if (key == "EOP" || key == "ION") {
+        lines2skip = 3;
+      }
+      if (lines2skip) {
+        for (int ii = 1; ii < lines2skip; ii++) {
+          stream->readLine();
+        }
+      }
+      continue;
     }
     else {
@@ -213 +239 @@
       }
       eph = new t_ephGPS(version(), lines);
+    }
+    else {
+      continue;
+    }
+    if (version() >= 4.0) {
+      if (eph->setNavType(navTypeStr) != success) {
+        delete eph;
+        continue;
+      }
     }
     _ephs.push_back(eph);
@@ -264 +299 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void t_rnxNavFile::writeHeader(const QMap<QString, QString>* txtMap) {
+void t_rnxNavFile::writeHeader(const QMap<QString, QString>* txtMap, int numMergedFiles, int leapSecs) {
 
   QString     runBy = BNC_CORE->userName();
@@ -334 +369 @@
            << "PGM / RUN BY / DATE\n";
 
+  if (version() >= 4.0) {
+    *_stream << QString("%1").arg(leapSecs, 6, 10, QLatin1Char(' ')).left(60).leftJustified(60)
+        << "LEAP SECONDS\n";
+
+    *_stream << QString("%1").arg(numMergedFiles, 19, 10, QLatin1Char(' ')).leftJustified(60)
+        << "MERGED FILE\n";
+  }
+
   QStringListIterator itCmnt(comments);
   while (itCmnt.hasNext()) {
@@ -339 +382 @@
   }
 
+
   *_stream << QString()
     .leftJustified(60)

trunk/BNC/src/rinex/rnxnavfile.h

@@ -25 +25 @@
 #ifndef RNXNAVFILE_H
 #define RNXNAVFILE_H
-
+#include <iostream>
 #include <queue>
 #include <QtCore>
@@ -35 +35 @@
 class bncPPPclient;
 class t_eph;
-
+using namespace std;
 #define defaultRnxNavVersion2 2.11
 #define defaultRnxNavVersion3 3.05
@@ -68 +68 @@
   void   setGlonass(bool glo) {_header._glonass = glo;}
   void   setGnssTypeV3(t_eph::e_type sys) {_header._satSys = sys;}
-  void   writeHeader(const QMap<QString, QString>* txtMap = 0);
+  void   writeHeader(const QMap<QString, QString>* txtMap = 0, int numMergedFiles = 0, int leapSecs = 0);
   void   writeEph(const t_eph* eph);