Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support ionospheric corrections parameters from rinex 3.0.4 #9

Open
wants to merge 2 commits into
base: stable
Choose a base branch
from
Open

Support ionospheric corrections parameters from rinex 3.0.4 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9d7401
Support more ionospheric correction parameters
agagniere Mar 4, 2023
c35c0e4
Compile in c++20
agagniere Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions BuildSetup.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -O2" )
set( CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} -O3" )
elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror=return-type -Werror=deprecated" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -Werror=deprecated" )
# Do not optimize for debug builds. Do the same for RELWITHDEBINFO ?
set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -O0 -g" )
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" )
Expand Down Expand Up @@ -170,12 +170,12 @@ if( DEBUG_VERBOSE )
message( STATUS "---- ${_variableName} = ${${_variableName}}" )
endforeach()
endif()

#----------------------------------------
# Get CMake vars into C++
#----------------------------------------
configure_file( "${PROJECT_SOURCE_DIR}/build_config.h.in" "${PROJECT_BINARY_DIR}/generated/build_config.h" )
include_directories( "${PROJECT_BINARY_DIR}/generated/" )
include_directories( "${PROJECT_BINARY_DIR}/generated/" )
install( FILES "${PROJECT_BINARY_DIR}/generated/build_config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" )

#----------------------------------------
Expand Down Expand Up @@ -204,14 +204,14 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
set( CPACK_GENERATOR "DEB;TGZ" )
else (${LINUX_DISTRO} MATCHES "RedHatEnterpriseServer")
message( STATUS "Detected a Linux machine")
set( CPACK_GENERATOR "DEB;TGZ" )
set( CPACK_GENERATOR "DEB;TGZ" )
endif()
elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
set( CPACK_GENERATOR "NSIS;ZIP" )
set( CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.md")
endif()

set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Libraries for the GNSS processing GNSSTk toolkit.")
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Libraries for the GNSS processing GNSSTk toolkit.")
set( CPACK_PACKAGE_VENDOR "ARL:UT SGL" )
set( CPACK_PACKAGE_CONTACT "David Barber <dbarber@arlut.utexas.edu>" )
set( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md" )
Expand All @@ -220,7 +220,7 @@ set( CPACK_PACKAGE_VERSION_MINOR "${GNSSTK_VERSION_MINOR}" )
set( CPACK_PACKAGE_VERSION_PATCH "${GNSSTK_VERSION_PATCH}" )
set( CPACK_INCLUDE_TOPLEVEL_DIRECTORY "OFF" )
set( CPACK_PACKAGE_INSTALL_DIRECTORY "gnsstk${GNSSTK_VERSION_MAJOR}.${GNSSTK_VERSION_MINOR}.${GNSSTK_VERSION_PATCH}" )
set( CPACK_TOPLEVEL_TAG "gnsstk" )
set( CPACK_TOPLEVEL_TAG "gnsstk" )

set( CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.13)" )
set( CPACK_DEBIAN_SECTION "stable" )
Expand Down
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,12 @@ install( FILES ${GNSSTK_INC_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
# GNSSTK Library parameters
#============================================================

set_target_properties(gnsstk PROPERTIES VERSION "${GNSSTK_VERSION_MAJOR}.${GNSSTK_VERSION_MINOR}.${GNSSTK_VERSION_PATCH}"
SOVERSION "${GNSSTK_VERSION_MAJOR}")
set_target_properties(gnsstk PROPERTIES
VERSION "${GNSSTK_VERSION_MAJOR}.${GNSSTK_VERSION_MINOR}.${GNSSTK_VERSION_PATCH}"
SOVERSION "${GNSSTK_VERSION_MAJOR}"
CXX_STANDARD 20
CXX_EXTENSIONS YES
)

#============================================================
# Testing
Expand Down
224 changes: 80 additions & 144 deletions core/lib/FileHandling/RINEX3/Rinex3NavHeader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,28 @@
#include <iostream>
#include <set>
#include <cmath>
#include <unordered_map>
#include <sstream>

using namespace gnsstk::StringUtils;
using namespace std;

namespace gnsstk
{

static const unordered_map<IonoCorr::CorrType, IonoCorr::CorrType>
dependent_pairs
{
{IonoCorr::CorrType::GPSA, IonoCorr::CorrType::GPSB},
{IonoCorr::CorrType::QZSA, IonoCorr::CorrType::QZSB},
{IonoCorr::CorrType::BDSA, IonoCorr::CorrType::BDSB},
{IonoCorr::CorrType::IRNA, IonoCorr::CorrType::IRNB},
{IonoCorr::CorrType::GPSB, IonoCorr::CorrType::GPSA},
{IonoCorr::CorrType::QZSB, IonoCorr::CorrType::QZSA},
{IonoCorr::CorrType::BDSB, IonoCorr::CorrType::BDSA},
{IonoCorr::CorrType::IRNB, IonoCorr::CorrType::IRNA}
};

const string Rinex3NavHeader::stringVersion = "RINEX VERSION / TYPE";
const string Rinex3NavHeader::stringRunBy = "PGM / RUN BY / DATE";
const string Rinex3NavHeader::stringComment = "COMMENT";
Expand Down Expand Up @@ -128,6 +144,12 @@ namespace gnsstk
case GAL: return std::string("GAL");
case GPSA: return std::string("GPSA");
case GPSB: return std::string("GPSB");
case QZSA: return std::string("QZSA");
case QZSB: return std::string("QZSB");
case BDSA: return std::string("BDSA");
case BDSB: return std::string("BDSB");
case IRNA: return std::string("IRNA");
case IRNB: return std::string("IRNB");
case Unknown:
break;
}
Expand All @@ -138,18 +160,24 @@ namespace gnsstk
void IonoCorr ::
fromString(const std::string str)
{
std::string STR(gnsstk::StringUtils::upperCase(str));
if (STR == std::string("GAL"))
type = GAL;
else if (STR == std::string("GPSA"))
type = GPSA;
else if (STR == std::string("GPSB"))
type = GPSB;
else
static const std::unordered_map<std::string, IonoCorr::CorrType> from_string
{
Exception e("Unknown IonoCorr type: " + str);
GNSSTK_THROW(e);
}
{"GAL", CorrType::GAL},
{"GPSA", CorrType::GPSA},
{"GPSB", CorrType::GPSB},
{"QZSA", CorrType::QZSA},
{"QZSB", CorrType::QZSB},
{"BDSA", CorrType::BDSA},
{"BDSB", CorrType::BDSB},
{"IRNA", CorrType::IRNA},
{"IRNB", CorrType::IRNB}
};
std::string key = gnsstk::StringUtils::upperCase(str);

if (!from_string.contains(key))
GNSSTK_THROW(Exception("Unknown ionospheric correction parameter: " + str));

type = from_string.at(key);
}


Expand Down Expand Up @@ -266,21 +294,21 @@ namespace gnsstk
{
// GPS alpha "ION ALPHA" R2.11
IonoCorr ic("GPSA");
for(i=0; i < 4; i++)
for(i = 0; i < 4; i++)
ic.param[i] = line.substr(2 + 12*i, 12);
mapIonoCorr[ic.asString()] = ic;
if(mapIonoCorr.find("GPSB") != mapIonoCorr.end())
valid |= validIonoCorrGPS;
mapIonoCorr[ic.type] = ic;
if (mapIonoCorr.contains(IonoCorr::CorrType::GPSB))
valid |= validIonoCorr;
}
else if(thisLabel == stringIonBeta)
{
// GPS beta "ION BETA" R2.11
IonoCorr ic("GPSB");
for(i=0; i < 4; i++)
for(i = 0; i < 4; i++)
ic.param[i] = line.substr(2 + 12*i, 12);
mapIonoCorr[ic.asString()] = ic;
if(mapIonoCorr.find("GPSA") != mapIonoCorr.end())
valid |= validIonoCorrGPS;
mapIonoCorr[ic.type] = ic;
if (mapIonoCorr.contains(IonoCorr::CorrType::GPSA))
valid |= validIonoCorr;
}
else if(thisLabel == stringIonoCorr)
{
Expand All @@ -295,25 +323,12 @@ namespace gnsstk
FFStreamError fse(e.what());
GNSSTK_THROW(e);
}
for(i=0; i < 4; i++)
for(i = 0; i < 4; i++)
ic.param[i] = line.substr(5 + 12*i, 12);

if(ic.type == IonoCorr::GAL)
{
valid |= validIonoCorrGal;
}
else if(ic.type == IonoCorr::GPSA)
{
if(mapIonoCorr.find("GPSB") != mapIonoCorr.end())
valid |= validIonoCorrGPS;
}
else if(ic.type == IonoCorr::GPSB)
{
if(mapIonoCorr.find("GPSA") != mapIonoCorr.end())
valid |= validIonoCorrGPS;
}
//else
mapIonoCorr[ic.asString()] = ic;
mapIonoCorr[ic.type] = ic;
if (!dependent_pairs.contains(ic.type)
|| mapIonoCorr.contains(dependent_pairs.at(ic.type)))
valid |= validIonoCorr;
}
else if(thisLabel == stringDeltaUTC)
{
Expand Down Expand Up @@ -511,68 +526,17 @@ namespace gnsstk
}
}

if ((valid & validIonoCorrGPS) || (valid & validIonoCorrGal))
if (valid & validIonoCorr)
{
// "IONOSPHERIC CORR"
map<string,IonoCorr>::const_iterator it;
for(it=mapIonoCorr.begin(); it != mapIonoCorr.end(); ++it)
for (auto const& [type, value] : mapIonoCorr)
{
switch(it->second.type)
{
case IonoCorr::GAL:
strm << "GAL ";
for(j=0; j<3; j++)
{
strm << it->second.param[j];
}
strm << " " << setw(7) << ' ' << stringIonoCorr;
break;
case IonoCorr::GPSA:
if(version >= 3)
{
strm << "GPSA ";
for(j=0; j<4; j++)
{
strm << it->second.param[j];
}
strm << setw(7) << ' ' << stringIonoCorr;
}
else
{
// "ION ALPHA" // R2.11
strm << " ";
for(j=0; j<4; j++)
{
strm << it->second.param[j];
}
strm << setw(10) << ' ' << stringIonAlpha;
}
break;
case IonoCorr::GPSB:
if(version >= 3)
{
strm << "GPSB ";
for(j=0; j<4; j++)
strm << it->second.param[j];
strm << setw(7) << ' ' << stringIonoCorr;
}
else
{
// "ION BETA" // R2.11
strm << " ";
for(j=0; j<4; j++)
strm << it->second.param[j];
strm << setw(10) << ' ' << stringIonBeta;
}
break;
case IonoCorr::Unknown:
default:
FFStreamError err("Unknown IonoCorr type " +
asString(it->second.type));
GNSSTK_THROW(err);
break;
}
strm << endlpp;
std::stringstream data;

data << std::left << std::setw(5) << value.asString();
for (auto const& parameter : value.param)
data << parameter;
strm << std::setw(60) << data.str() << stringIonoCorr << endlpp;
}
}

Expand Down Expand Up @@ -724,38 +688,30 @@ namespace gnsstk
s << endl;
}

map<string,IonoCorr>::const_iterator icit;
for(icit=mapIonoCorr.begin(); icit != mapIonoCorr.end(); ++icit)
for (auto const & [type, value] : mapIonoCorr)
{
s << "Iono correction for " << icit->second.asString() << " : "
s << "Iono correction for " << value.asString() << ": "
<< scientific << setprecision(4);
switch(icit->second.type)
switch (type)
{
case IonoCorr::GAL:
s << "ai0 = " << icit->second.param[0]
<< ", ai1 = " << icit->second.param[1]
<< ", ai2 = " << icit->second.param[2];
break;
case IonoCorr::GPSA:
s << "alpha " << icit->second.param[0]
<< " " << icit->second.param[1]
<< " " << icit->second.param[2]
<< " " << icit->second.param[3];
break;
case IonoCorr::GPSB:
s << "beta " << icit->second.param[0]
<< " " << icit->second.param[1]
<< " " << icit->second.param[2]
<< " " << icit->second.param[3];
break;
case IonoCorr::Unknown:
default:
FFStreamError err("Unknown IonoCorr type " +
asString(icit->second.type));
GNSSTK_THROW(err);
break;
case IonoCorr::CorrType::GPSA:
case IonoCorr::CorrType::QZSA:
case IonoCorr::CorrType::BDSA:
case IonoCorr::CorrType::IRNA:
s << "aplha";
break;
case IonoCorr::CorrType::GPSB:
case IonoCorr::CorrType::QZSB:
case IonoCorr::CorrType::BDSB:
case IonoCorr::CorrType::IRNB:
s << "beta";
break;
default:
s << "ai";
}
s << endl;
for (auto const& parameter : value.param)
s << " " << parameter;
s << std::endl;
}

if(valid & validLeapSeconds)
Expand Down Expand Up @@ -891,26 +847,6 @@ namespace gnsstk
else
{
lineMap[stringDUTC] = true;
}
if (((lici = mapIonoCorr.find("GPSA")) != mapIonoCorr.end()) &&
((rici = right.mapIonoCorr.find("GPSA")) != right.mapIonoCorr.end()))

{
// lineMap[stringIonAlpha] = lici->second == rici->second;
}
else
{
lineMap[stringIonAlpha] = true;
}
if (((lici = mapIonoCorr.find("GPSB")) != mapIonoCorr.end()) &&
((rici = right.mapIonoCorr.find("GPSB")) != right.mapIonoCorr.end()))

{
// lineMap[stringIonBeta] = lici->second == rici->second;
}
else
{
lineMap[stringIonBeta] = true;
}
// ...then filter by inclExclList later
if (incl)
Expand Down
Loading