Changeset 8932 in ntrip


Ignore:
Timestamp:
Apr 30, 2020, 12:05:59 PM (5 months ago)
Author:
stuerze
Message:

QZSS fit intervall: different specifications in differet RINEX versions are now considerred

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/BNC_2.12/src/ephemeris.cpp

    r8930 r8932  
    307307        double fitIntervalRnx;
    308308        readDbl(line, pos[1], fieldLen, fitIntervalRnx);
    309         if        (type() == t_eph::GPS) {
    310           if (rnxVersion < 3.03) {// specified as flag for GPS
    311             _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::GPS);
    312           } else {                // specified as time period for GPS since 3.03
     309        if        (type() == t_eph::GPS) {  // in RINEX specified allways as time period for GPS
    313310            _fitInterval = fitIntervalRnx;
     311        } else if (type() == t_eph::QZSS) { // specified as flag for QZSS
     312          if (rnxVersion == 3.02) {
     313            _fitInterval = fitIntervalRnx; // specified as time period
    314314          }
    315         } else if (type() == t_eph::QZSS) { // specified as flag for QZSS
    316           _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
     315          else {
     316            _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
     317          }
    317318        }
    318319      }
     
    494495  }
    495496  else {
    496     double fitIntervalRnx;
    497     if      (type() == t_eph::GPS) {
    498       if (version < 3.03) { // specified as flag)
    499         (_fitInterval == 4.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
    500       }
    501       else {
    502         fitIntervalRnx = _fitInterval; // specified as time period in hours
    503       }
    504     }
    505     else if (type() == t_eph::QZSS) {    // specified as flag
     497    // for GPS and QZSS in version 3.02 specified in hours
     498    double fitIntervalRnx = _fitInterval;
     499    // otherwise specified as flag
     500    if (type() == t_eph::QZSS && version != 3.02) {
    506501      (_fitInterval == 2.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
    507502    }
Note: See TracChangeset for help on using the changeset viewer.