Index: trunk/BNC/src/RTCM3/RTCM3Decoder.cpp =================================================================== --- trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (revision 10999) +++ trunk/BNC/src/RTCM3/RTCM3Decoder.cpp (revision 11000) @@ -2263,4 +2263,5 @@ if ((id >= 1057 && id <= 1068) || (id >= 1240 && id <= 1270) || + (id > 0 && id <= 100) || (id == 4076)) { if (!_coDecoders.contains(_staID.toLatin1())) { Index: trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp =================================================================== --- trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 10999) +++ trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp (revision 11000) @@ -505,6 +505,12 @@ satPhaseBias._ssrFormat = (_type == RTCMssr) ? ssrRtcmOld : (_type == RTCMnewssr) ? ssrRtcmNew : ssrUnknown; - satPhaseBias._dispBiasConsistInd = _phaseBias.DispersiveBiasConsistencyIndicator; - satPhaseBias._MelbWuebConsistInd = _phaseBias.MWConsistencyIndicator; + if (satPhaseBias._ssrFormat == e_ssrFormat::ssrRtcmNew) { + satPhaseBias._satYawInfoInd = _phaseBias.SatelliteYawInformationIndicator; + satPhaseBias._extPBPhaseInd = _phaseBias.ExtendedPhaseBiasPropertyID; + } + else { + satPhaseBias._dispBiasConsistInd = _phaseBias.DispersiveBiasConsistencyIndicator; + satPhaseBias._MelbWuebConsistInd = _phaseBias.MWConsistencyIndicator; + } satPhaseBias._yaw = _phaseBias.Sat[ii].YawAngle; satPhaseBias._yawRate = _phaseBias.Sat[ii].YawRate; @@ -513,8 +519,15 @@ t_frqPhaseBias frqPhaseBias; frqPhaseBias._rnxType2ch.assign(_ssrCorr->codeTypeToRnxType(sys, biasEntry.Type)); - frqPhaseBias._value = biasEntry.Bias; - frqPhaseBias._fixIndicator = biasEntry.IntegerIndicator; - frqPhaseBias._fixWideLaneIndicator = biasEntry.WidelaneGroupIndicator; - frqPhaseBias._jumpCounter = biasEntry.DiscontinuityCounter; + frqPhaseBias._value = biasEntry.Bias; + frqPhaseBias._fixIndicator = biasEntry.IntegerIndicator; + if (satPhaseBias._ssrFormat == e_ssrFormat::ssrRtcmNew) { + if (satPhaseBias._extPBPhaseInd) { + frqPhaseBias._fixWideLaneIndicator = biasEntry.WidelaneGroupIndicator; + } + } + else { + frqPhaseBias._fixWideLaneIndicator = biasEntry.WidelaneGroupIndicator; + } + frqPhaseBias._jumpCounter = biasEntry.DiscontinuityCounter; if (!frqPhaseBias._rnxType2ch.empty()) { satPhaseBias._bias.push_back(frqPhaseBias); Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp =================================================================== --- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 10999) +++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit_rtcm_new.cpp (revision 11000) @@ -380,6 +380,8 @@ E_GPS_SATELLITE_ID(b->Sat[i].ID) E_NO_OF_BIASES(b->Sat[i].NumberOfPhaseBiases) - E_YAW_ANGLE(b->Sat[i].YawAngle) - E_YAW_RATE(b->Sat[i].YawRate) + if (b->SatelliteYawInformationIndicator) { + E_YAW_ANGLE(b->Sat[i].YawAngle) + E_YAW_RATE(b->Sat[i].YawRate) + } for (j = 0; j < b->Sat[i].NumberOfPhaseBiases; ++j) { E_GNSS_SIGNAL_IDENTIFIER(b->Sat[i].Biases[j].Type) @@ -605,6 +607,8 @@ pb->Sat[pos].ID = id; D_NO_OF_BIASES(pb->Sat[pos].NumberOfPhaseBiases) - D_YAW_ANGLE(pb->Sat[pos].YawAngle) - D_YAW_RATE(pb->Sat[pos].YawRate) + if (pb->SatelliteYawInformationIndicator) { + D_YAW_ANGLE(pb->Sat[pos].YawAngle) + D_YAW_RATE(pb->Sat[pos].YawRate) + } #ifdef BNC_DEBUG_SSR fprintf(stderr, "id %2d #%d y %10.6f yr %10.6f ", @@ -619,5 +623,5 @@ D_PHASE_BIAS_CORRECTION(pb->Sat[pos].Biases[j].Bias) #ifdef BNC_DEBUG_SSR - fprintf(stderr, "t%02d int %d disc %d b %8.4f ", + fprintf(stderr, "t %02d int %02d disc %d b %8.4f ", pb->Sat[pos].Biases[j].Type, pb->Sat[pos].Biases[j].IntegerIndicator, @@ -677,10 +681,7 @@ D_WIDE_LANE_INDICATOR(pb->Sat[pos].Biases[j].WidelaneGroupIndicator) #ifdef BNC_DEBUG_SSR - fprintf(stderr, "t%02d int %d /*wl %d*/ disc %d b %8.4f ", + fprintf(stderr, "t %02d wl %d ", pb->Sat[pos].Biases[j].Type, - pb->Sat[pos].Biases[j].IntegerIndicator, - pb->Sat[pos].Biases[j].WidelaneGroupIndicator, - pb->Sat[pos].Biases[j].DiscontinuityCounter, - pb->Sat[pos].Biases[j].Bias); + pb->Sat[pos].Biases[j].WidelaneGroupIndicator); #endif } @@ -1038,5 +1039,5 @@ D_CODE_BIAS(b->Sat[pos].Biases[j].Bias) #ifdef BNC_DEBUG_SSR - fprintf(stderr, "t%02d b %8.2f ", + fprintf(stderr, "t %02d b %8.2f ", b->Sat[pos].Biases[j].Type, b->Sat[pos].Biases[j].Bias); #endif Index: trunk/BNC/src/satObs.cpp =================================================================== --- trunk/BNC/src/satObs.cpp (revision 10999) +++ trunk/BNC/src/satObs.cpp (revision 11000) @@ -10,9 +10,10 @@ // Constructor //////////////////////////////////////////////////////////////////////////// -t_clkCorr::t_clkCorr() { - _updateInt = 0; - _iod = 0; - _dClk = 0.0; - _dotDClk = 0.0; +t_clkCorr::t_clkCorr() +{ + _updateInt = 0; + _iod = 0; + _dClk = 0.0; + _dotDClk = 0.0; _dotDotDClk = 0.0; } @@ -20,5 +21,6 @@ // //////////////////////////////////////////////////////////////////////////// -void t_clkCorr::writeEpoch(ostream* out, const QList& corrList) { +void t_clkCorr::writeEpoch(ostream* out, const QList& corrList) +{ if (!out || corrList.size() == 0) { return; @@ -31,12 +33,12 @@ if (!epoTime.valid()) { epoTime = corr._time; - *out << "> CLOCK " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " - << corr._updateInt << " " - << corrList.size() << ' ' << corr._staID << endl; + *out << "> CLOCK " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1, ' ') << " " + << corr._updateInt << " " + << corrList.size() << ' ' << corr._staID << endl; } *out << corr._prn.toString() << ' ' << setw(11) << corr._iod << ' ' - << setw(10) << setprecision(4) << corr._dClk * t_CST::c << ' ' // m - << setw(10) << setprecision(4) << corr._dotDClk * t_CST::c * 1.e3 << ' ' // m/s => mm/s - << setw(10) << setprecision(4) << corr._dotDotDClk * t_CST::c * 1.e3 << endl; // m/s² => mm/s² + << setw(10) << setprecision(4) << corr._dClk * t_CST::c << ' ' // m + << setw(10) << setprecision(4) << corr._dotDClk * t_CST::c * 1.e3 << ' ' // m/s => mm/s + << setw(10) << setprecision(4) << corr._dotDotDClk * t_CST::c * 1.e3 << endl; // m/s² => mm/s² } out->flush(); @@ -45,9 +47,10 @@ // //////////////////////////////////////////////////////////////////////////// -void t_clkCorr::readEpoch(const string& epoLine, istream& inStream, QList& corrList) { - bncTime epoTime; +void t_clkCorr::readEpoch(const string& epoLine, istream& inStream, QList& corrList) +{ + bncTime epoTime; unsigned int updateInt; - int numCorr; - string staID; + int numCorr; + string staID; if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numCorr, staID) != t_corrSSR::clkCorr) { return; @@ -55,7 +58,7 @@ for (int ii = 0; ii < numCorr; ii++) { t_clkCorr corr; - corr._time = epoTime; + corr._time = epoTime; corr._updateInt = updateInt; - corr._staID = staID; + corr._staID = staID; string line; @@ -66,10 +69,10 @@ char sys = corr._prn.system(); - int num = corr._prn.number(); + int num = corr._prn.number(); int flag = t_corrSSR::getSsrNavTypeFlag(sys, num); corr._prn.setFlag(flag); - corr._dClk /= (t_CST::c); - corr._dotDClk /= (t_CST::c * 1.e3); + corr._dClk /= (t_CST::c); + corr._dotDClk /= (t_CST::c * 1.e3); corr._dotDotDClk /= (t_CST::c * 1.e3); @@ -80,10 +83,13 @@ // Constructor //////////////////////////////////////////////////////////////////////////// -t_orbCorr::t_orbCorr() { +t_orbCorr::t_orbCorr() +{ _updateInt = 0; - _iod = 0; - _system = 'R'; - _xr.ReSize(3); _xr = 0.0; - _dotXr.ReSize(3); _dotXr = 0.0; + _iod = 0; + _system = 'R'; + _xr.ReSize(3); + _xr = 0.0; + _dotXr.ReSize(3); + _dotXr = 0.0; _ssrFormat = ssrUnknown; } @@ -91,5 +97,6 @@ // //////////////////////////////////////////////////////////////////////////// -void t_orbCorr::writeEpoch(ostream* out, const QList& corrList) { +void t_orbCorr::writeEpoch(ostream* out, const QList& corrList) +{ if (!out || corrList.size() == 0) { return; @@ -102,16 +109,16 @@ if (!epoTime.valid()) { epoTime = corr._time; - *out << "> ORBIT " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " - << corr._updateInt << " " - << corrList.size() << ' ' << corr._staID << endl; + *out << "> ORBIT " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1, ' ') << " " + << corr._updateInt << " " + << corrList.size() << ' ' << corr._staID << endl; *out << " " << static_cast(corr._ssrFormat) << endl; } *out << corr._prn.toString() << ' ' << setw(11) << corr._iod << ' ' - << setw(10) << setprecision(4) << corr._xr[0] << ' ' - << setw(10) << setprecision(4) << corr._xr[1] << ' ' - << setw(10) << setprecision(4) << corr._xr[2] << " " - << setw(10) << setprecision(4) << corr._dotXr[0] * 1.e3 << ' ' // m/s => mm/s - << setw(10) << setprecision(4) << corr._dotXr[1] * 1.e3 << ' ' // m/s => mm/s - << setw(10) << setprecision(4) << corr._dotXr[2] * 1.e3 << endl; // m/s => mm/s + << setw(10) << setprecision(4) << corr._xr[0] << ' ' + << setw(10) << setprecision(4) << corr._xr[1] << ' ' + << setw(10) << setprecision(4) << corr._xr[2] << " " + << setw(10) << setprecision(4) << corr._dotXr[0] * 1.e3 << ' ' // m/s => mm/s + << setw(10) << setprecision(4) << corr._dotXr[1] * 1.e3 << ' ' // m/s => mm/s + << setw(10) << setprecision(4) << corr._dotXr[2] * 1.e3 << endl; // m/s => mm/s } out->flush(); @@ -120,9 +127,10 @@ // //////////////////////////////////////////////////////////////////////////// -void t_orbCorr::readEpoch(const string& epoLine, istream& inStream, QList& corrList) { - bncTime epoTime; +void t_orbCorr::readEpoch(const string& epoLine, istream& inStream, QList& corrList) +{ + bncTime epoTime; unsigned int updateInt; - int numCorr; - string staID; + int numCorr; + string staID; if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numCorr, staID) != t_corrSSR::orbCorr) { return; @@ -142,7 +150,7 @@ for (int ii = 0; ii < numCorr; ii++) { t_orbCorr corr; - corr._time = epoTime; + corr._time = epoTime; corr._updateInt = updateInt; - corr._staID = staID; + corr._staID = staID; corr._ssrFormat = ssrFormat; @@ -151,10 +159,8 @@ istringstream in(line.c_str()); - in >> corr._prn >> corr._iod - >> corr._xr[0] >> corr._xr[1] >> corr._xr[2] - >> corr._dotXr[0] >> corr._dotXr[1] >> corr._dotXr[2]; + in >> corr._prn >> corr._iod >> corr._xr[0] >> corr._xr[1] >> corr._xr[2] >> corr._dotXr[0] >> corr._dotXr[1] >> corr._dotXr[2]; char sys = corr._prn.system(); - int num = corr._prn.number(); + int num = corr._prn.number(); int flag = t_corrSSR::getSsrNavTypeFlag(sys, num); corr._prn.setFlag(flag); @@ -170,13 +176,15 @@ // Constructor //////////////////////////////////////////////////////////////////////////// -t_URA::t_URA() { - _updateInt = 0; - _iod = 0; - _ura = 0.0; -} - -// -//////////////////////////////////////////////////////////////////////////// -void t_URA::writeEpoch(ostream* out, const QList& corrList) { +t_URA::t_URA() +{ + _updateInt = 0; + _iod = 0; + _ura = 0.0; +} + +// +//////////////////////////////////////////////////////////////////////////// +void t_URA::writeEpoch(ostream* out, const QList& corrList) +{ if (!out || corrList.size() == 0) { return; @@ -189,10 +197,10 @@ if (!epoTime.valid()) { epoTime = corr._time; - *out << "> URA " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " - << corr._updateInt << " " - << corrList.size() << ' ' << corr._staID << endl; + *out << "> URA " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1, ' ') << " " + << corr._updateInt << " " + << corrList.size() << ' ' << corr._staID << endl; } *out << corr._prn.toString() << ' ' << setw(11) << corr._iod << ' ' - << setw(10) << setprecision(4) << corr._ura << endl; + << setw(10) << setprecision(4) << corr._ura << endl; } out->flush(); @@ -201,9 +209,10 @@ // //////////////////////////////////////////////////////////////////////////// -void t_URA::readEpoch(const string& epoLine, istream& inStream, QList& corrList) { - bncTime epoTime; +void t_URA::readEpoch(const string& epoLine, istream& inStream, QList& corrList) +{ + bncTime epoTime; unsigned int updateInt; - int numCorr; - string staID; + int numCorr; + string staID; if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numCorr, staID) != t_corrSSR::URA) { return; @@ -211,7 +220,7 @@ for (int ii = 0; ii < numCorr; ii++) { t_URA corr; - corr._time = epoTime; + corr._time = epoTime; corr._updateInt = updateInt; - corr._staID = staID; + corr._staID = staID; string line; @@ -222,5 +231,5 @@ char sys = corr._prn.system(); - int num = corr._prn.number(); + int num = corr._prn.number(); int flag = t_corrSSR::getSsrNavTypeFlag(sys, num); corr._prn.setFlag(flag); @@ -232,5 +241,6 @@ // //////////////////////////////////////////////////////////////////////////// -void t_satCodeBias::writeEpoch(ostream* out, const QList& biasList) { +void t_satCodeBias::writeEpoch(ostream* out, const QList& biasList) +{ if (!out || biasList.size() == 0) { return; @@ -243,7 +253,7 @@ if (!epoTime.valid()) { epoTime = satCodeBias._time; - *out << "> CODE_BIAS " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " - << satCodeBias._updateInt << " " - << biasList.size() << ' ' << satCodeBias._staID << endl; + *out << "> CODE_BIAS " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1, ' ') << " " + << satCodeBias._updateInt << " " + << biasList.size() << ' ' << satCodeBias._staID << endl; } *out << satCodeBias._prn.toString() << " " << setw(2) << satCodeBias._bias.size(); @@ -251,5 +261,5 @@ const t_frqCodeBias& frqCodeBias = satCodeBias._bias[ii]; *out << " " << frqCodeBias._rnxType2ch << ' ' - << setw(10) << setprecision(4) << frqCodeBias._value; + << setw(10) << setprecision(4) << frqCodeBias._value; } *out << endl; @@ -260,9 +270,10 @@ // //////////////////////////////////////////////////////////////////////////// -void t_satCodeBias::readEpoch(const string& epoLine, istream& inStream, QList& biasList) { - bncTime epoTime; +void t_satCodeBias::readEpoch(const string& epoLine, istream& inStream, QList& biasList) +{ + bncTime epoTime; unsigned int updateInt; - int numSat; - string staID; + int numSat; + string staID; if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numSat, staID) != t_corrSSR::codeBias) { return; @@ -270,7 +281,7 @@ for (int ii = 0; ii < numSat; ii++) { t_satCodeBias satCodeBias; - satCodeBias._time = epoTime; + satCodeBias._time = epoTime; satCodeBias._updateInt = updateInt; - satCodeBias._staID = staID; + satCodeBias._staID = staID; string line; @@ -282,5 +293,5 @@ char sys = satCodeBias._prn.system(); - int num = satCodeBias._prn.number(); + int num = satCodeBias._prn.number(); int flag = t_corrSSR::getSsrNavTypeFlag(sys, num); satCodeBias._prn.setFlag(flag); @@ -300,5 +311,6 @@ // //////////////////////////////////////////////////////////////////////////// -void t_satPhaseBias::writeEpoch(ostream* out, const QList& biasList) { +void t_satPhaseBias::writeEpoch(ostream* out, const QList& biasList) +{ if (!out || biasList.size() == 0) { return; @@ -311,31 +323,49 @@ if (!epoTime.valid()) { epoTime = satPhaseBias._time; - *out << "> PHASE_BIAS " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " - << satPhaseBias._updateInt << " " - << biasList.size() << ' ' << satPhaseBias._staID << endl; + *out << "> PHASE_BIAS " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1, ' ') << " " + << satPhaseBias._updateInt << " " + << biasList.size() << ' ' << satPhaseBias._staID << endl; if (satPhaseBias._ssrFormat == e_ssrFormat::ssrRtcmNew) { *out << " " << static_cast(satPhaseBias._ssrFormat) << " " - << satPhaseBias._satYawInfoInd << " " - << satPhaseBias._extPBPhaseInd << endl; - } else { - *out << " " << static_cast(satPhaseBias._ssrFormat) << " " - << satPhaseBias._dispBiasConsistInd << " " - << satPhaseBias._MelbWuebConsistInd << endl; - } - } - *out << satPhaseBias._prn.toString() << ' ' - << setw(12) << setprecision(8) << satPhaseBias._yaw * 180.0 / M_PI << ' ' - << setw(12) << setprecision(8) << satPhaseBias._yawRate * 180.0 / M_PI<< " " - << setw(2) << satPhaseBias._bias.size(); - for (unsigned ii = 0; ii < satPhaseBias._bias.size(); ii++) { - const t_frqPhaseBias& frqPhaseBias = satPhaseBias._bias[ii]; - *out << " " << frqPhaseBias._rnxType2ch << ' ' - << setw(10) << setprecision(4) << frqPhaseBias._value << ' ' - << setw(3) << frqPhaseBias._fixIndicator << ' ' - << setw(3) << frqPhaseBias._fixWideLaneIndicator << ' ' - << setw(3) << frqPhaseBias._jumpCounter; - } - *out << endl; + << satPhaseBias._satYawInfoInd << " " + << satPhaseBias._extPBPhaseInd << endl; + } + else { + *out << " " << static_cast(satPhaseBias._ssrFormat) << " " + << satPhaseBias._dispBiasConsistInd << " " + << satPhaseBias._MelbWuebConsistInd << endl; + } + } + if (satPhaseBias._ssrFormat == e_ssrFormat::ssrRtcmNew) { + *out << satPhaseBias._prn.toString() << ' ' + << setw(12) << setprecision(8) << satPhaseBias._yaw * 180.0 / M_PI << ' ' + << setw(12) << setprecision(8) << satPhaseBias._yawRate * 180.0 / M_PI << " " + << setw(2) << satPhaseBias._bias.size(); + for (unsigned ii = 0; ii < satPhaseBias._bias.size(); ii++) { + const t_frqPhaseBias& frqPhaseBias = satPhaseBias._bias[ii]; + *out << " " << frqPhaseBias._rnxType2ch << ' ' + << setw(10) << setprecision(4) << frqPhaseBias._value << ' ' + << setw(3) << frqPhaseBias._fixIndicator << ' ' + << setw(3) << frqPhaseBias._fixWideLaneIndicator << ' ' + << setw(3) << frqPhaseBias._jumpCounter; + } + *out << endl; + } + else { + *out << satPhaseBias._prn.toString() << ' ' + << setw(12) << setprecision(8) << satPhaseBias._yaw * 180.0 / M_PI << ' ' + << setw(12) << setprecision(8) << satPhaseBias._yawRate * 180.0 / M_PI << " " + << setw(2) << satPhaseBias._bias.size(); + for (unsigned ii = 0; ii < satPhaseBias._bias.size(); ii++) { + const t_frqPhaseBias& frqPhaseBias = satPhaseBias._bias[ii]; + *out << " " << frqPhaseBias._rnxType2ch << ' ' + << setw(10) << setprecision(4) << frqPhaseBias._value << ' ' + << setw(3) << frqPhaseBias._fixIndicator << ' ' + << setw(3) << frqPhaseBias._fixWideLaneIndicator << ' ' + << setw(3) << frqPhaseBias._jumpCounter; + } + *out << endl; + } } out->flush(); @@ -344,12 +374,13 @@ // //////////////////////////////////////////////////////////////////////////// -void t_satPhaseBias::readEpoch(const string& epoLine, istream& inStream, QList& biasList) { - bncTime epoTime; +void t_satPhaseBias::readEpoch(const string& epoLine, istream& inStream, QList& biasList) +{ + bncTime epoTime; unsigned int updateInt; - int numSat; - string staID; + int numSat; + string staID; unsigned int metadata1; unsigned int metadata2; - e_ssrFormat ssrFormat = ssrUnknown; + e_ssrFormat ssrFormat = ssrUnknown; if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numSat, staID) != t_corrSSR::phaseBias) { return; @@ -357,7 +388,7 @@ for (int ii = 0; ii <= numSat; ii++) { t_satPhaseBias satPhaseBias; - satPhaseBias._time = epoTime; + satPhaseBias._time = epoTime; satPhaseBias._updateInt = updateInt; - satPhaseBias._staID = staID; + satPhaseBias._staID = staID; string line; @@ -372,23 +403,23 @@ } satPhaseBias._ssrFormat = ssrFormat; - switch(ssrFormat) { - case e_ssrFormat::ssrRtcmNew: - satPhaseBias._dispBiasConsistInd = metadata1; - satPhaseBias._MelbWuebConsistInd = metadata2; - break; - case e_ssrFormat::ssrRtcmOld: - case e_ssrFormat::ssrUnknown: - satPhaseBias._satYawInfoInd = metadata1; - satPhaseBias._extPBPhaseInd = metadata2; - break; + switch (ssrFormat) { + case e_ssrFormat::ssrRtcmNew: + satPhaseBias._dispBiasConsistInd = metadata1; + satPhaseBias._MelbWuebConsistInd = metadata2; + break; + case e_ssrFormat::ssrRtcmOld: + case e_ssrFormat::ssrUnknown: + satPhaseBias._satYawInfoInd = metadata1; + satPhaseBias._extPBPhaseInd = metadata2; + break; } int numBias; double yawDeg, yawDegRate; - in >> satPhaseBias._prn >> yawDeg >> yawDegRate >> numBias; + in >> satPhaseBias._prn >> yawDeg >> yawDegRate >> numBias; satPhaseBias._yaw = yawDeg * M_PI / 180.0; satPhaseBias._yawRate = yawDegRate * M_PI / 180.0; char sys = satPhaseBias._prn.system(); - int num = satPhaseBias._prn.number(); + int num = satPhaseBias._prn.number(); int flag = t_corrSSR::getSsrNavTypeFlag(sys, num); satPhaseBias._prn.setFlag(flag); @@ -396,7 +427,5 @@ while (in.good()) { t_frqPhaseBias frqPhaseBias; - in >> frqPhaseBias._rnxType2ch >> frqPhaseBias._value - >> frqPhaseBias._fixIndicator >> frqPhaseBias._fixWideLaneIndicator - >> frqPhaseBias._jumpCounter; + in >> frqPhaseBias._rnxType2ch >> frqPhaseBias._value >> frqPhaseBias._fixIndicator >> frqPhaseBias._fixWideLaneIndicator >> frqPhaseBias._jumpCounter; if (!frqPhaseBias._rnxType2ch.empty()) { satPhaseBias._bias.push_back(frqPhaseBias); @@ -410,5 +439,6 @@ // //////////////////////////////////////////////////////////////////////////// -void t_vTec::write(ostream* out, const t_vTec& vTec) { +void t_vTec::write(ostream* out, const t_vTec& vTec) +{ if (!out || vTec._layers.size() == 0) { return; @@ -416,15 +446,15 @@ out->setf(ios::fixed); bncTime epoTime = vTec._time; - *out << "> VTEC " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " - << vTec._updateInt << " " - << vTec._layers.size() << ' ' << vTec._staID << endl; + *out << "> VTEC " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1, ' ') << " " + << vTec._updateInt << " " + << vTec._layers.size() << ' ' << vTec._staID << endl; for (unsigned ii = 0; ii < vTec._layers.size(); ii++) { const t_vTecLayer& layer = vTec._layers[ii]; - *out << setw(2) << ii+1 << ' ' - << setw(2) << layer._C.Nrows()-1 << ' ' - << setw(2) << layer._C.Ncols()-1 << ' ' - << setw(10) << setprecision(1) << layer._height << endl - << setw(10) << setprecision(4) << layer._C - << setw(10) << setprecision(4) << layer._S; + *out << setw(2) << ii + 1 << ' ' + << setw(2) << layer._C.Nrows() - 1 << ' ' + << setw(2) << layer._C.Ncols() - 1 << ' ' + << setw(10) << setprecision(1) << layer._height << endl + << setw(10) << setprecision(4) << layer._C + << setw(10) << setprecision(4) << layer._S; } out->flush(); @@ -433,9 +463,10 @@ // //////////////////////////////////////////////////////////////////////////// -void t_vTec::read(const string& epoLine, istream& inStream, t_vTec& vTec) { - bncTime epoTime; +void t_vTec::read(const string& epoLine, istream& inStream, t_vTec& vTec) +{ + bncTime epoTime; unsigned int updateInt; - int numLayers; - string staID; + int numLayers; + string staID; if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numLayers, staID) != t_corrSSR::vTec) { return; @@ -444,7 +475,7 @@ return; } - vTec._time = epoTime; + vTec._time = epoTime; vTec._updateInt = updateInt; - vTec._staID = staID; + vTec._staID = staID; for (int ii = 0; ii < numLayers; ii++) { t_vTecLayer layer; @@ -457,6 +488,6 @@ in >> dummy >> maxDeg >> maxOrd >> layer._height; - layer._C.ReSize(maxDeg+1, maxOrd+1); - layer._S.ReSize(maxDeg+1, maxOrd+1); + layer._C.ReSize(maxDeg + 1, maxOrd + 1); + layer._S.ReSize(maxDeg + 1, maxOrd + 1); for (int iDeg = 0; iDeg <= maxDeg; iDeg++) { @@ -478,20 +509,20 @@ //////////////////////////////////////////////////////////////////////////// t_corrSSR::e_type t_corrSSR::readEpoLine(const string& line, bncTime& epoTime, - unsigned int& updateInt, int& numEntries, - string& staID) { + unsigned int& updateInt, int& numEntries, + string& staID) +{ istringstream inLine(line.c_str()); - char epoChar; + char epoChar; string typeString; - int year, month, day, hour, min; + int year, month, day, hour, min; double sec; - inLine >> epoChar >> typeString - >> year >> month >> day >> hour >> min >> sec >> updateInt >> numEntries >> staID; + inLine >> epoChar >> typeString >> year >> month >> day >> hour >> min >> sec >> updateInt >> numEntries >> staID; if (epoChar == '>') { epoTime.set(year, month, day, hour, min, sec); - if (typeString == "CLOCK") { + if (typeString == "CLOCK") { return clkCorr; } @@ -518,34 +549,35 @@ // Set NAV type to force NAVtype usage according SSR standard ///////////////////////////////////////////////////////////// -t_eph::e_type t_corrSSR::getSsrNavTypeFlag(char sys, int num) { +t_eph::e_type t_corrSSR::getSsrNavTypeFlag(char sys, int num) +{ t_eph::e_type flag = t_eph::undefined; switch (sys) { - case 'G': - case 'J': - case 'I': // not part of the SSR standard - flag = t_eph::LNAV; - break; - case 'R': - flag = t_eph::FDMA_M; - break; - case 'E': - flag = t_eph::INAV; - break; - case 'C': - if (num < 6) {// GEO - flag = t_eph::D2; - } - else if (num > 58 && num < 63) { // GEO - flag = t_eph::D2; - } - else { - flag = t_eph::D1; - } - break; - case 'S': - flag = t_eph::SBASL1; - break; + case 'G': + case 'J': + case 'I': // not part of the SSR standard + flag = t_eph::LNAV; + break; + case 'R': + flag = t_eph::FDMA_M; + break; + case 'E': + flag = t_eph::INAV; + break; + case 'C': + if (num < 6) { // GEO + flag = t_eph::D2; + } + else if (num > 58 && num < 63) { // GEO + flag = t_eph::D2; + } + else { + flag = t_eph::D1; + } + break; + case 'S': + flag = t_eph::SBASL1; + break; }