Changeset 2642 in ntrip

Timestamp:

Nov 4, 2010, 4:05:06 PM (14 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncpppclient.cpp (modified) (2 diffs)

trunk/BNC/bncpppclient.cpp

@@ -251 +251 @@
 
   if (_eph.contains(prn)) {
-////    t_ephGPS* eLast = static_cast<t_ephGPS*>(_eph.value(prn)->last);
-////    if ( (eLast->GPSweek() <  gpseph.GPSweek) || 
-////         (eLast->GPSweek() == gpseph.GPSweek &&  
-////          eLast->TOC()     <  gpseph.TOC) ) {
-    if (true) { // simply take the last one
+    t_ephGPS* eLast = static_cast<t_ephGPS*>(_eph.value(prn)->last);
+    if ( (eLast->GPSweek() <  gpseph.GPSweek) || 
+         (eLast->GPSweek() == gpseph.GPSweek &&  
+          eLast->TOC()     <  gpseph.TOC) ) {
       delete static_cast<t_ephGPS*>(_eph.value(prn)->prev);
       _eph.value(prn)->prev = _eph.value(prn)->last;
@@ -281 +280 @@
     int tow = gloeph.GPSTOW; 
     updatetime(&ww, &tow, gloeph.tb*1000, 0);  // Moscow -> GPS
-////    t_ephGlo* eLast = static_cast<t_ephGlo*>(_eph.value(prn)->last);
-////    if (eLast->GPSweek() < ww || 
-////        (eLast->GPSweek()  == ww &&  eLast->GPSweeks() <  tow)) {  
-    if (true) { // simply take the last one
+    t_ephGlo* eLast = static_cast<t_ephGlo*>(_eph.value(prn)->last);
+    if (eLast->GPSweek() < ww || 
+        (eLast->GPSweek()  == ww &&  eLast->GPSweeks() <  tow)) {  
       delete static_cast<t_ephGlo*>(_eph.value(prn)->prev);
       _eph.value(prn)->prev = _eph.value(prn)->last;