Changeset 3539 in ntrip

Timestamp:

Dec 22, 2011, 1:47:22 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncapp.cpp (modified) (1 diff)

trunk/BNC/bncapp.cpp

@@ -247 +247 @@
   glonassephemeris** ee = &_glonassEph[glonasseph->almanac_number-1];
 
+  int wwOld, towOld, wwNew, towNew;
+  if (*ee != 0) {
+    wwOld  = (*ee)->GPSWeek;
+    towOld = (*ee)->GPSTOW; 
+    updatetime(&wwOld, &towOld, (*ee)->tb*1000, 0);  // Moscow -> GPS
+
+    wwNew  = glonasseph->GPSWeek;
+    towNew = glonasseph->GPSTOW; 
+    updatetime(&wwNew, &towNew, glonasseph->tb*1000, 0); // Moscow -> GPS
+  }
+
   if ( *ee == 0      || 
-       glonasseph->GPSWeek > (*ee)->GPSWeek ||
-         ( glonasseph->GPSWeek == (*ee)->GPSWeek && 
-           glonasseph->GPSTOW > (*ee)->GPSTOW ) ) {
+       wwNew > wwOld ||
+       (wwNew == wwOld && towNew > towOld) ) {
     delete *ee;
     *ee = glonasseph;