Changeset 2040 in ntrip

Timestamp:

Nov 26, 2009, 3:30:26 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/ephemeris.h (modified) (1 diff)
• bncpppclient.cpp (modified) (2 diffs)

trunk/BNC/RTCM3/ephemeris.h

@@ -50 +50 @@
   t_ephGPS() { }
   ~t_ephGPS() {}
+  double TOC() const {return _TOC;}
 
   void set(const gpsephemeris* ee);

trunk/BNC/bncpppclient.cpp

@@ -115 +115 @@
   QString prn = QString("G%1").arg(gpseph.satellite, 2, 10, QChar('0'));
 
+  cout << "EPH " << prn.toAscii().data() << " " << gpseph.IODE << " " 
+       << gpseph.IODC << endl;
+
   if (_eph.contains(prn)) {
-    (static_cast<t_ephGPS*>(_eph.value(prn)))->set(&gpseph);
+    t_ephGPS* ee = static_cast<t_ephGPS*>(_eph.value(prn));
+    if ( (ee->GPSweek() <  gpseph.GPSweek) || 
+         (ee->GPSweek() == gpseph.GPSweek &&  
+          ee->TOC()     <  gpseph.TOC) ) {  
+      ee->set(&gpseph);
+    }
   }
   else {
@@ -160 +168 @@
 
   if (_eph.contains(prn)) {
-    _eph.value(prn)->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
+    t_eph* ee = _eph.value(prn);
+    ee->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
+
+    if (_corr.contains(prn)) {
+      t_corr* cc = _corr.value(prn);
+      cout << "found: " << prn.toAscii().data() 
+           << " age: "  << (tt - cc->tt) << " "
+           << ee->IOD() << " " << cc->iod << endl;
+    }
+    else {
+      cout << "not found: " << prn.toAscii().data() << endl;
+    }
+
     return success;
   }