Changeset 3539 in ntrip


Ignore:
Timestamp:
Dec 22, 2011, 1:47:22 PM (10 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/bncapp.cpp

    r3537 r3539  
    247247  glonassephemeris** ee = &_glonassEph[glonasseph->almanac_number-1];
    248248
     249  int wwOld, towOld, wwNew, towNew;
     250  if (*ee != 0) {
     251    wwOld  = (*ee)->GPSWeek;
     252    towOld = (*ee)->GPSTOW;
     253    updatetime(&wwOld, &towOld, (*ee)->tb*1000, 0);  // Moscow -> GPS
     254
     255    wwNew  = glonasseph->GPSWeek;
     256    towNew = glonasseph->GPSTOW;
     257    updatetime(&wwNew, &towNew, glonasseph->tb*1000, 0); // Moscow -> GPS
     258  }
     259
    249260  if ( *ee == 0      ||
    250        glonasseph->GPSWeek > (*ee)->GPSWeek ||
    251          ( glonasseph->GPSWeek == (*ee)->GPSWeek &&
    252            glonasseph->GPSTOW > (*ee)->GPSTOW ) ) {
     261       wwNew > wwOld ||
     262       (wwNew == wwOld && towNew > towOld) ) {
    253263    delete *ee;
    254264    *ee = glonasseph;
Note: See TracChangeset for help on using the changeset viewer.