mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-14 20:20:35 +00:00
Merge branch 'shura-current' of https://github.com/koloboxer/gnss-sdr into next
This commit is contained in:
commit
6228d198d2
@ -429,7 +429,7 @@ bool Gnss_Sdr_Supl_Client::load_gal_ephemeris_xml(const std::string& file_name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool save_gal_ephemeris_map_xml(const std::string& file_name, std::map<int, Galileo_Ephemeris> eph_map)
|
bool Gnss_Sdr_Supl_Client::save_gal_ephemeris_map_xml(const std::string& file_name, std::map<int, Galileo_Ephemeris> eph_map)
|
||||||
{
|
{
|
||||||
if (eph_map.empty() == false)
|
if (eph_map.empty() == false)
|
||||||
{
|
{
|
||||||
@ -476,7 +476,7 @@ bool Gnss_Sdr_Supl_Client::load_cnav_ephemeris_xml(const std::string& file_name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool save_cnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps_CNAV_Ephemeris> eph_map)
|
bool Gnss_Sdr_Supl_Client::save_cnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps_CNAV_Ephemeris> eph_map)
|
||||||
{
|
{
|
||||||
if (eph_map.empty() == false)
|
if (eph_map.empty() == false)
|
||||||
{
|
{
|
||||||
@ -510,9 +510,9 @@ bool Gnss_Sdr_Supl_Client::load_gnav_ephemeris_xml(const std::string& file_name)
|
|||||||
{
|
{
|
||||||
ifs.open(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
|
ifs.open(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
|
||||||
boost::archive::xml_iarchive xml(ifs);
|
boost::archive::xml_iarchive xml(ifs);
|
||||||
gps_cnav_ephemeris_map.clear();
|
glonass_gnav_ephemeris_map.clear();
|
||||||
xml >> boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", this->glonass_gnav_ephemeris_map);
|
xml >> boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", this->glonass_gnav_ephemeris_map);
|
||||||
LOG(INFO) << "Loaded GLONASS ephemeris map data with " << this->gps_cnav_ephemeris_map.size() << " satellites";
|
LOG(INFO) << "Loaded GLONASS ephemeris map data with " << this->glonass_gnav_ephemeris_map.size() << " satellites";
|
||||||
}
|
}
|
||||||
catch (std::exception& e)
|
catch (std::exception& e)
|
||||||
{
|
{
|
||||||
@ -523,7 +523,7 @@ bool Gnss_Sdr_Supl_Client::load_gnav_ephemeris_xml(const std::string& file_name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool save_gnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Glonass_Gnav_Ephemeris> eph_map)
|
bool Gnss_Sdr_Supl_Client::save_gnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Glonass_Gnav_Ephemeris> eph_map)
|
||||||
{
|
{
|
||||||
if (eph_map.empty() == false)
|
if (eph_map.empty() == false)
|
||||||
{
|
{
|
||||||
|
@ -122,7 +122,7 @@ public:
|
|||||||
/*!
|
/*!
|
||||||
* \brief Save GPS CNAV ephemeris map to XML file.
|
* \brief Save GPS CNAV ephemeris map to XML file.
|
||||||
*/
|
*/
|
||||||
bool save_cnav_ephemeris_map_xml(const std::string file_name,
|
bool save_cnav_ephemeris_map_xml(const std::string& file_name,
|
||||||
std::map<int, Gps_CNAV_Ephemeris> eph_map);
|
std::map<int, Gps_CNAV_Ephemeris> eph_map);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@ -133,7 +133,7 @@ public:
|
|||||||
/*!
|
/*!
|
||||||
* \brief Save Galileo ephemeris map to XML file.
|
* \brief Save Galileo ephemeris map to XML file.
|
||||||
*/
|
*/
|
||||||
bool save_gal_ephemeris_map_xml(const std::string file_name,
|
bool save_gal_ephemeris_map_xml(const std::string& file_name,
|
||||||
std::map<int, Galileo_Ephemeris> eph_map);
|
std::map<int, Galileo_Ephemeris> eph_map);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
@ -144,7 +144,7 @@ public:
|
|||||||
/*!
|
/*!
|
||||||
* \brief Save GLONASS GNAV ephemeris map to XML file.
|
* \brief Save GLONASS GNAV ephemeris map to XML file.
|
||||||
*/
|
*/
|
||||||
bool save_gnav_ephemeris_map_xml(const std::string file_name,
|
bool save_gnav_ephemeris_map_xml(const std::string& file_name,
|
||||||
std::map<int, Glonass_Gnav_Ephemeris> eph_map);
|
std::map<int, Glonass_Gnav_Ephemeris> eph_map);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
Loading…
Reference in New Issue
Block a user