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

Timestamp:

Dec 10, 2024, 3:57:21 PM (3 months ago)

Author:

stuerze

Message:

RINEX version 4.02 updates

File:

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

trunk/BNC/src/rinex/reqcedit.cpp

@@ -586 +586 @@
   bool haveGPS     = false;
   bool haveGlonass = false;
-  QMap<t_eph::e_type, bool> haveGnss;
+  QMap<t_eph::e_system, bool> haveGnss;
   for (int ii = 0; ii < _ephs.size(); ii++) {
     const t_eph* eph = _ephs[ii];
-    switch (eph->type()) {
+    switch (eph->system()) {
       case t_eph::GPS:
         haveGPS = true;
@@ -680 +680 @@
     bncTime begTime = _begTime;
     bncTime endTime = _endTime;
-    if (eph->type() == t_eph::BDS) {
+    if (eph->system() == t_eph::BDS) {
       begTime += 14;
       endTime += 14;
@@ -695 +695 @@
 
     if (outNavFile.version() < 3.0) {
-          if (outNavFile.glonass() && eph->type() != t_eph::GLONASS) {
+          if (outNavFile.glonass() && eph->system() != t_eph::GLONASS) {
             continue;
           }
-          if (!outNavFile.glonass() && eph->type() != t_eph::GPS) {
+          if (!outNavFile.glonass() && eph->system() != t_eph::GPS) {
             continue;
       }
     }
-
-    if (outNavFile.version() < 4.0) {
-      if (eph->ephType() == t_eph::CNAV ||
-          eph->ephType() == t_eph::CNV1 ||
-          eph->ephType() == t_eph::CNV2 ||
-          eph->ephType() == t_eph::CNV3) {
-        continue;
-      }
-    }
-
-    if (outNavFile.version() >= 4.0 &&
-        eph->ephType() == t_eph::undefined) { // input files < version 4.0
-      continue;
-    }
-
     outNavFile.writeEph(eph);
   }
@@ -739 +724 @@
 
     if (isNew) {
-      if      (eph->type() == t_eph::GPS) {
+      if      (eph->system() == t_eph::GPS) {
         ephs.append(new t_ephGPS(*dynamic_cast<t_ephGPS*>(eph)));
       }
-      else if (eph->type() == t_eph::GLONASS) {
+      else if (eph->system() == t_eph::GLONASS) {
         ephs.append(new t_ephGlo(*dynamic_cast<t_ephGlo*>(eph)));
       }
-      else if (eph->type() == t_eph::Galileo) {
+      else if (eph->system() == t_eph::Galileo) {
         ephs.append(new t_ephGal(*dynamic_cast<t_ephGal*>(eph)));
       }
-      else if (eph->type() == t_eph::QZSS) {
+      else if (eph->system() == t_eph::QZSS) {
         ephs.append(new t_ephGPS(*dynamic_cast<t_ephGPS*>(eph)));
       }
-      else if (eph->type() == t_eph::SBAS) {
+      else if (eph->system() == t_eph::SBAS) {
         ephs.append(new t_ephSBAS(*dynamic_cast<t_ephSBAS*>(eph)));
       }
-      else if (eph->type() == t_eph::BDS) {
+      else if (eph->system() == t_eph::BDS) {
         ephs.append(new t_ephBDS(*dynamic_cast<t_ephBDS*>(eph)));
       }
-      else if (eph->type() == t_eph::IRNSS) {
+      else if (eph->system() == t_eph::IRNSS) {
         ephs.append(new t_ephGPS(*dynamic_cast<t_ephGPS*>(eph)));
       }