Skip to content

Commit

Permalink
Merge branch 'release/v14.0.0' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
gloppyuser committed Dec 23, 2022
2 parents 62df6a4 + 1feba5b commit c4b1b21
Show file tree
Hide file tree
Showing 260 changed files with 10,960 additions and 2,368 deletions.
181 changes: 82 additions & 99 deletions .gitlab-ci.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion BuildGNSSTkWindows.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# run in projects/gnsstk
cd build
cmake -DBUILD_EXT=true -DCMAKE_INSTALL_PREFIX=$HOMEDRIVE$HOMEPATH/.local/gnsstkDiffProc -G"Visual Studio 14 2015 Win64" ../
cmake -DBUILD_EXT=true -DCMAKE_INSTALL_PREFIX=$HOMEDRIVE$HOMEPATH/.local/gnsstkDiffProc -G"Visual Studio 16 2019" -A x64 ../
cmake --build . --config release --target install
cd ..

2 changes: 1 addition & 1 deletion BuildGNSSTkWindowsRelativeInstall.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# run in projects/gnsstk
cd build
cmake -DBUILD_EXT=true -DCMAKE_INSTALL_PREFIX=../install -G"Visual Studio 14 2015 Win64" ../
cmake -DBUILD_EXT=true -DCMAKE_INSTALL_PREFIX=../install -G"Visual Studio 16 2019" -A x64 ../
cmake --build . --config release --target install
cd ..

4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
cmake_minimum_required( VERSION 3.7.2 )

project( GNSSTK )
set( GNSSTK_VERSION_MAJOR "13" )
set( GNSSTK_VERSION_MINOR "8" )
set( GNSSTK_VERSION_MAJOR "14" )
set( GNSSTK_VERSION_MINOR "0" )
set( GNSSTK_VERSION_PATCH "0" )
set( GNSSTK_VERSION "${GNSSTK_VERSION_MAJOR}.${GNSSTK_VERSION_MINOR}.${GNSSTK_VERSION_PATCH}" )

Expand Down
31 changes: 31 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
# Version 14.0.0 Tuesday December 20, 2022

Modifications by Author
-----------------------
Dan Wright <[email protected]> (2):
Ci clean build
Deprecated debian 9

David Barber <[email protected]> (1):
adding ubuntu-20.04 jobs

John Knutson <[email protected]> (10):
Add NavData::clone method to leaf classes to make alterable shared_ptr copies that don't affect the original
Update SWIG cmake rules now that we're no longer supporting cmake version 2
Add signal details to nav dump methods
Helmert transform/reference frames refactor
Implement group delay calculator
Fix swig build error
Add a CorrectorType that was missed
Change group path corrector navLib from shared_ptr to reference to work around swig/python problem
Move NewNav enums to the namespace level for consistency
Update NewNav docs

Sarah Magliocca <[email protected]> (1):
Updating the GNSSTk build scripts for visual studio 2019

Taben Malik <[email protected]> (1):
Refactored RawRange



# Version 13.8.0 Monday October 31, 2022

Modifications by Author
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "GNSS ToolKit Software Library"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 13.8.0
PROJECT_NUMBER = 14.0.0

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ To build and install the python bindings, you have two options:
Testing:
--------

See the TESTING.txt for details.
See the TESTING.md for details.


Help & Docs:
Expand Down
156 changes: 84 additions & 72 deletions RELNOTES.md
Original file line number Diff line number Diff line change
@@ -1,90 +1,102 @@
GNSSTk 13.8.0 Release Notes
GNSSTk 14.0.0 Release Notes
========================

* This release includes the following:
* Updating documentation of TropModel classes.
* Spliting test data into gnsstk-data repo with submodules configured.
* Updating sphinx documentation of SWIG bindings.
* Adding support for GLONASS CDMA nav data processing (See New Modules below)
* Additionally, it contains bug fixes, build and CI updates.
* This release introduces a major update to the toolkit.
* It includes the following:
* Refactoring HelmertTransform into HelmertTransformer and reference frames into RefFrame.
* Adding signal details to nav dump methods.
* Adding group path delay calculator GroupPathCorr and related classes. (See New Modules below).
* Refactoring duplicate raw range implementations into a single class.
* Moving NewNav enums to the namespace level for consistency.
* Deprecating support for Debian 9.
* Adding support for Ubuntu20.04 (focal)
* Additionally, it contains minor library updates and bug fixes

Updates since v13.7.0
Updates since v13.8.0
---------------------

**Build System and Test Suite**
* Update Changed the minimum cmake version
* Fix Remove SystemTime tests that randomly fail
* Fix ORD tests to use the GNSSTk testing framework
* Update the clean build parameter
* Update SWIG cmake rules now that we're no longer supporting cmake version 2
* Update compiler to Visual Studio 2019 in the Windows build scripts.

**Gitlab CI**
* Update CODEOWNERS.
* Fix pipeline push artifacts
* Update Deprecated Debian 9 build
* Add Ubuntu 20.04 pipeline jobs

**Library Changes**
* Update change string name in StringUtils to avoid conflict with curses library macro
* Update exception specifications from throw() to noexcept
* Update documentation of TropModel classes
* Update move nav message bit definition enums out of PNBNavDataFactory.cpp files and into their own files.
* Add documentation on raw range (geometric range) computations
* Add Split test data into gnsstk-data repo with submodules configured
* Add support for GLONASS CDMA nav data processing
* Update sphinx documentation of SWIG bindings
* Update Deprecate extraneous swig binding for function that no longer exists.
* Add group path delay calculator (GroupPathCorr and related classes).
* Update Refactor HelmertTransform into HelmertTransformer
* Update Refactor reference frames into RefFrame
* Update the nonsensical ISC interface in NavLibrary with one that does make sense.
* Update Refactor duplicate raw range implementations into a single class.
* Update group path corrector navLib from shared_ptr to reference to work around swig/python problem
* Update Move NewNav enums to the namespace level for consistency
* Update NewNav docs
* Add NavData::clone method
* Add signal details to nav dump methods
* Add group path delay calculator (GroupPathCorr and related classes).
* Add a CorrectorType that was missed

Fixes since v13.7.0
Fixes since v13.8.0
--------------------
* Fix week rollover issues in GPS LNav, Galileo F/Nav and Galileo I/Nav decoders.
* Fix bugs in GLONASS CDMA nav data processing
* Fix swig build error

Removed Code due to Deprecation
-------------------------------
core/tests/ORD/OrdMockClasses.hpp
swig/sphinx/sphinxsetup.py
core/lib/GNSSEph/GloEphemeris.cpp
core/lib/GNSSEph/GloEphemeris.hpp

New Modules
-------------------------------
core/lib/NewNav/GLOCBits.hpp
core/lib/NewNav/GLOCNavAlm.cpp
core/lib/NewNav/GLOCNavAlm.hpp
core/lib/NewNav/GLOCNavAlmCorrected.hpp
core/lib/NewNav/GLOCNavAlmDeltas.hpp
core/lib/NewNav/GLOCNavAlmNumberCruncher.hpp
core/lib/NewNav/GLOCNavAlmUncorrected.hpp
core/lib/NewNav/GLOCNavData.cpp
core/lib/NewNav/GLOCNavEph.cpp
core/lib/NewNav/GLOCNavEph.hpp
core/lib/NewNav/GLOCNavHeader.cpp
core/lib/NewNav/GLOCNavHeader.hpp
core/lib/NewNav/GLOCNavHealth.cpp
core/lib/NewNav/GLOCNavHealth.hpp
core/lib/NewNav/GLOCNavIono.cpp
core/lib/NewNav/GLOCNavIono.hpp
core/lib/NewNav/GLOCNavLTDMP.cpp
core/lib/NewNav/GLOCNavLTDMP.hpp
core/lib/NewNav/GLOCNavUT1TimeOffset.cpp
core/lib/NewNav/GLOCNavUT1TimeOffset.hpp
core/lib/NewNav/GLOCOrbitType.cpp
core/lib/NewNav/GLOCOrbitType.hpp
core/lib/NewNav/GLOCRegime.cpp
core/lib/NewNav/GLOCRegime.hpp
core/lib/NewNav/GLOCSatType.cpp
core/lib/NewNav/GLOCSatType.hpp
core/lib/NewNav/GPSC2Bits.hpp
core/lib/NewNav/GPSCBits.hpp
core/lib/NewNav/GPSLBits.hpp
core/lib/NewNav/GalFBits.hpp
core/lib/NewNav/GalIBits.hpp
core/lib/NewNav/NavFit.hpp
core/lib/NewNav/PNBGLOCNavDataFactory.cpp
core/lib/NewNav/PNBGLOCNavDataFactory.hpp
core/lib/TimeHandling/GLONASSTime.cpp
core/lib/TimeHandling/GLONASSTime.hpp
core/tests/NewNav/GLOCNavAlm_T.cpp
core/tests/NewNav/GLOCNavEph_T.cpp
core/tests/NewNav/GLOCNavHealth_T.cpp
core/tests/NewNav/GLOCNavLTDMP_T.cpp
core/tests/NewNav/GLOCNavTestDataDecl.hpp
core/tests/NewNav/GLOCNavTestDataDef.hpp
core/tests/NewNav/GLOCNavUT1TimeOffset_T.cpp
core/tests/NewNav/PNBGLOCNavDataFactory_T.cpp
core/tests/TimeHandling/GLONASSTime_T.cpp
core/lib/FileHandling/MetReader.hpp
core/lib/GNSSCore/BCISCorrector.cpp
core/lib/GNSSCore/BCISCorrector.hpp
core/lib/GNSSCore/BCIonoCorrector.cpp
core/lib/GNSSCore/BCIonoCorrector.hpp
core/lib/GNSSCore/CorrDupHandling.cpp
core/lib/GNSSCore/CorrDupHandling.hpp
core/lib/GNSSCore/CorrectionResult.hpp
core/lib/GNSSCore/CorrectionResults.cpp
core/lib/GNSSCore/CorrectionResults.hpp
core/lib/GNSSCore/CorrectorType.cpp
core/lib/GNSSCore/CorrectorType.hpp
core/lib/GNSSCore/GroupPathCorr.cpp
core/lib/GNSSCore/GroupPathCorr.hpp
core/lib/GNSSCore/GroupPathCorrector.hpp
core/lib/GNSSCore/HelmertTransformer.cpp
core/lib/GNSSCore/HelmertTransformer.hpp
core/lib/GNSSCore/RefFrame.cpp
core/lib/GNSSCore/RefFrame.hpp
core/lib/GNSSCore/RefFrameRlz.cpp
core/lib/GNSSCore/RefFrameRlz.hpp
core/lib/GNSSCore/RefFrameSys.cpp
core/lib/GNSSCore/RefFrameSys.hpp
core/lib/GNSSCore/TransformLibrary.cpp
core/lib/GNSSCore/TransformLibrary.hpp
core/lib/GNSSCore/Transformer.hpp
core/lib/GNSSCore/TropCorrector.hpp
core/lib/GNSSEph/RawRange.cpp
core/lib/GNSSEph/RawRange.hpp
core/lib/NewNav/GLOFNavPCode.cpp
core/lib/NewNav/GLOFNavPCode.hpp
core/lib/NewNav/GLOFNavSatType.hpp
core/lib/NewNav/GPSLNavL2Codes.cpp
core/lib/NewNav/GPSLNavL2Codes.hpp
core/tests/FileHandling/MetReader_T.cpp
core/tests/GNSSCore/BCISCorrector_T.cpp
core/tests/GNSSCore/BCIonoCorrector_T.cpp
core/tests/GNSSCore/CorrDupHandling_T.cpp
core/tests/GNSSCore/CorrectionResults_T.cpp
core/tests/GNSSCore/CorrectorType_T.cpp
core/tests/GNSSCore/GroupPathCorr_T.cpp
core/tests/GNSSCore/GroupPathCorrector_T.cpp
core/tests/GNSSCore/HelmertTransformer_T.cpp
core/tests/GNSSCore/RawRange_T.cpp
core/tests/GNSSCore/RefFrameRlz_T.cpp
core/tests/GNSSCore/RefFrameSys_T.cpp
core/tests/GNSSCore/TransformLibrary_T.cpp
core/tests/GNSSCore/TropCorrector_T.cpp
core/tests/Geomatics/PreciseRange_T.cpp
swig/SWIGHelpers/std_tuple.i
swig/tests/__init__.py
12 changes: 12 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,20 @@ if [ -f "$LOG" ]; then
fi

if [ $clean ]; then

case `uname` in
Linux)
echo "Uninstalling using install_manifest.txt if it exists..."
find $build_root -name "install_manifest.txt" -exec cat {} \; | xargs rm -fv
;;
*)
echo "Not running make uninstall on non-Linux systems"
;;
esac

rm -rf "$build_root"/*
log "Cleaned out $build_root ..."

fi

if ((verbose>0)); then
Expand Down
56 changes: 37 additions & 19 deletions ext/lib/Rxio/MetReader.cpp → core/lib/FileHandling/MetReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,46 @@ using namespace std;

namespace gnsstk
{

// ---------------------------------------------------------------------
// ---------------------------------------------------------------------
void MetReader::read(const std::string& fn)
{
RinexMetStream rms;
try { rms.open(fn.c_str(), ios::in); }
catch (...) {
cerr << "Error reading weather data from file " << fn << endl;
exit(-1);
MetReader ::
MetReader()
: verboseLevel(0)
{
}

RinexMetData rmd;
while (rms >> rmd)

MetReader ::
MetReader(const std::string& fn)
: verboseLevel(0)
{
WxObservation wob(
rmd.time,
rmd.data[RinexMetHeader::TD],
rmd.data[RinexMetHeader::PR],
rmd.data[RinexMetHeader::HR]);
wx.insertObservation(wob);
if (!read(fn))
{
FileMissingException exc("Unable to read from "+fn);
GNSSTK_THROW(exc);
}
}
} // end of read()


bool MetReader ::
read(const std::string& fn)
{
RinexMetStream rms;
rms.open(fn.c_str(), ios::in);
if (!rms)
{
return false;
}

RinexMetData rmd;
while (rms >> rmd)
{
WxObservation wob(
rmd.time,
rmd.data[RinexMetHeader::TD],
rmd.data[RinexMetHeader::PR],
rmd.data[RinexMetHeader::HR]);
wx.insertObservation(wob);
}
return true;
} // end of read()

}
Loading

0 comments on commit c4b1b21

Please sign in to comment.