Changeset 6471 in ntrip for trunk/BNC

Timestamp:

Dec 28, 2014, 11:14:32 AM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTCM3

Files:

• RTCM3coDecoder.cpp (modified) (3 diffs)
• RTCM3coDecoder.h (modified) (1 diff)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -249 +249 @@
       orbCorrections.push_back(orbCorr);
 
-      _IODs[orbCorr._prn.toString()] = _clkOrb.Sat[ii].IOD;
+      _IODs[orbCorr._prn] = _clkOrb.Sat[ii].IOD;
     }
 
@@ -267 +267 @@
       clkCorr._dotDotDClk = _clkOrb.Sat[ii].Clock.DeltaA2 / t_CST::c;
 
-      if (_IODs.contains(clkCorr._prn.toString())) {
-        clkCorr._iod = _IODs[clkCorr._prn.toString()];
+      _lastClkCorrections[clkCorr._prn] = clkCorr;
+
+      if (_IODs.contains(clkCorr._prn)) {
+        clkCorr._iod = _IODs[clkCorr._prn];
         clkCorrections.push_back(clkCorr);
       }
@@ -277 +279 @@
     if ( _clkOrb.messageType == COTYPE_GPSHR     ||
          _clkOrb.messageType == COTYPE_GLONASSHR ) {
+
+      t_prn prn(sysCh, _clkOrb.Sat[ii].ID);
+      if (_lastClkCorrections.contains(prn)) {
+        t_clkCorr clkCorr;
+        clkCorr        = _lastClkCorrections[prn];
+        clkCorr._time  = _lastTime;
+        clkCorr._dClk  +=_clkOrb.Sat[ii].hrclock / t_CST::c;
+        if (_IODs.contains(clkCorr._prn)) {
+          clkCorr._iod = _IODs[clkCorr._prn];
+          clkCorrections.push_back(clkCorr);
+        }
+      }
     }
   }

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -66 +66 @@
   int            _providerID[3];
   bncTime        _lastTime;
-  QMap<std::string, unsigned short> _IODs;
-  QMap<bncTime, QList<t_orbCorr> >  _orbCorrections;
-  QMap<bncTime, QList<t_clkCorr> >  _clkCorrections;
+  QMap<t_prn, unsigned short>          _IODs;
+  QMap<bncTime, QList<t_orbCorr> >     _orbCorrections;
+  QMap<bncTime, QList<t_clkCorr> >     _clkCorrections;
+  QMap<t_prn, t_clkCorr>               _lastClkCorrections;
+  QMap<bncTime, QList<t_satCodeBias> > _codeBiases;
 };