Changeset 8934 in ntrip


Ignore:
Timestamp:
Apr 30, 2020, 12:08:28 PM (3 months ago)
Author:
stuerze
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/ephemeris.cpp

    r8931 r8934  
    304304        double fitIntervalRnx;
    305305        readDbl(line, pos[1], fieldLen, fitIntervalRnx);
    306         if        (type() == t_eph::GPS) {
    307           if (rnxVersion < 3.03) {// specified as flag for GPS
    308             _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::GPS);
    309           } else {                // specified as time period for GPS since 3.03
     306        if        (type() == t_eph::GPS) {  // in RINEX specified allways as time period for GPS
    310307            _fitInterval = fitIntervalRnx;
     308        } else if (type() == t_eph::QZSS) { // specified as flag for QZSS
     309          if (rnxVersion == 3.02) {
     310            _fitInterval = fitIntervalRnx; // specified as time period
    311311          }
    312         } else if (type() == t_eph::QZSS) { // specified as flag for QZSS
    313           _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
     312          else {
     313            _fitInterval = fitIntervalFromFlag(fitIntervalRnx, _IODC, t_eph::QZSS);
     314          }
    314315        }
    315316      }
     
    492493  }
    493494  else {
    494     double fitIntervalRnx;
    495     if      (type() == t_eph::GPS) {
    496       if (version < 3.03) { // specified as flag)
    497         (_fitInterval == 4.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
    498       }
    499       else {
    500         fitIntervalRnx = _fitInterval; // specified as time period in hours
    501       }
    502     }
    503     else if (type() == t_eph::QZSS) {    // specified as flag
     495    // for GPS and QZSS in version 3.02 specified in hours
     496    double fitIntervalRnx = _fitInterval;
     497    // otherwise specified as flag
     498    if (type() == t_eph::QZSS && version != 3.02) {
    504499      (_fitInterval == 2.0) ? fitIntervalRnx = 0.0 : fitIntervalRnx = 1.0;
    505500    }
Note: See TracChangeset for help on using the changeset viewer.