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

Timestamp:

Jan 31, 2025, 10:30:08 AM (2 months ago)

Author:

stuerze

Message:

ADDED: consideration of NAV type in all applications

Location:

trunk/BNC/src/rinex

Files:

• corrfile.cpp (modified) (2 diffs)
• rnxnavfile.cpp (modified) (3 diffs)
• rnxobsfile.cpp (modified) (3 diffs)

trunk/BNC/src/rinex/corrfile.cpp

@@ -35 +35 @@
  * Created:    12-Feb-2012
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -98 +98 @@
       while (it.hasNext()) {
         const t_orbCorr& corr = it.next();
-        _corrIODs[QString(corr._prn.toInternalString().c_str())] = corr._iod;
+        QString corrPrn = QString(corr._prn.toInternalString().c_str());
+        _corrIODs[corrPrn] = corr._iod;
       }
       emit newOrbCorrections(orbCorrList);

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -303 +303 @@
 
     if (eph) {
-      eph->setType(navType);
       _ephs.push_back(eph);
     }
@@ -321 +320 @@
     while (itIOD.hasNext()) {
       itIOD.next();
-      QString prn = itIOD.key();
-      unsigned int iod = itIOD.value();
+      QString      corrPrn = itIOD.key();
+      unsigned int corrIod = itIOD.value();
       vector<t_eph*>::iterator it = _ephs.begin();
       while (it != _ephs.end()) {
         t_eph* eph = *it;
         double dt = eph->TOC() - tt;
-        if (dt < 8*3600.0 && QString(eph->prn().toInternalString().c_str()) == prn && eph->IOD() == iod) {
+        QString      ephPrn = QString(eph->prn().toInternalString().c_str());
+        unsigned int ephIod = eph->IOD();
+        if (dt < 8*3600.0 &&
+            ephPrn == corrPrn &&
+            ephIod == corrIod) {
           it = _ephs.erase(it);
           return eph;
@@ -343 +346 @@
       t_eph* eph = *it;
       double dt = eph->TOC() - tt;
-      if (dt < 2*3600.0) {
+      char sys = eph->prn().system();
+      int  num = eph->prn().number();
+      int ssrNavType = t_corrSSR::getSsrNavTypeFlag(sys, num);
+      if (dt < 2*3600.0 && eph->type() == ssrNavType) {
         it = _ephs.erase(it);
         return eph;

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -1224 +1224 @@
       line = _stream->readLine();
       t_prn prn; prn.set(line.left(3).toLatin1().data());
+      char sys = prn.system();
+      int num  = prn.number();
+      int flag = t_corrSSR::getSsrNavTypeFlag(sys, num);
+      prn.setFlag(flag);
       _currEpo.rnxSat[iSat].prn = prn;
-      char sys = prn.system();
       for (int iType = 0; iType < _header.nTypes(sys); iType++) {
         int pos = 3 + 16*iType;
@@ -1309 +1312 @@
         sys = 'G';
       }
-      int satNum; readInt(line, pos + 1, 2, satNum);
-      _currEpo.rnxSat[iSat].prn.set(sys, satNum);
+      int num; readInt(line, pos + 1, 2, num);
+      int flag = t_corrSSR::getSsrNavTypeFlag(sys, num);
+      t_prn prn;
+      prn.set(sys, num, flag);
+      _currEpo.rnxSat[iSat].prn = prn;
 
       pos += 3;
@@ -1593 +1599 @@
                                  const t_rnxObsFile::t_rnxSat& rnxSat, t_satObs& obs) {
   obs._staID = rnxObsFile->markerName().toLatin1().constData();
+  obs._time  = epo->tt;
   obs._prn   = rnxSat.prn;
-  obs._time  = epo->tt;
-
-  char sys   = rnxSat.prn.system();
+
+  char sys  = obs._prn.system();
+  int  num  = obs._prn.number();
+  int  flag = t_corrSSR::getSsrNavTypeFlag(sys, num);
+  obs._prn.setFlag(flag);
 
   QChar addToL2;