Changeset 9765 in ntrip for trunk/BNC/src/rinex/reqcedit.cpp

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)

File:

• trunk/BNC/src/rinex/reqcedit.cpp (modified) (4 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;
     }