henry/SimCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CHG: added missing creation of the geographiclib resources in position copy constructor

Browse Source
This commit is contained in:
Henry Winkel
2023-03-27 13:49:21 +02:00
parent e83e29190d
commit 76ff5c6bac
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/SimCore/Position.cpp
View File

@@ -24,6 +24,10 @@ namespace SimCore {
std::lock_guard<std::mutex> lock(other.mx); std::lock_guard<std::mutex> lock(other.mx);
GeocentricPos_ = other.GeocentricPos_; GeocentricPos_ = other.GeocentricPos_;
GeodesicPos_ = other.GeodesicPos_; GeodesicPos_ = other.GeodesicPos_;
earth_ = std::make_unique<GeographicLib::Geocentric>(GeographicLib::Constants::WGS84_a(), GeographicLib::Constants::WGS84_f());
geod_ = std::make_unique<GeographicLib::Geodesic>(GeographicLib::Constants::WGS84_a(), GeographicLib::Constants::WGS84_f());
wgs84_ = std::make_unique<GeographicLib::Ellipsoid>(GeographicLib::Constants::WGS84_a(), GeographicLib::Constants::WGS84_f());
} }
@@ -59,7 +63,10 @@ namespace SimCore {
GeocentricPos_(GeocentricPosition::Y) = Y; GeocentricPos_(GeocentricPosition::Y) = Y;
GeocentricPos_(GeocentricPosition::Z)= Z; GeocentricPos_(GeocentricPosition::Z)= Z;
earth_->Reverse(GeocentricPos_(GeocentricPosition::X),GeocentricPos_(GeocentricPosition::Y),GeocentricPos_(GeocentricPosition::Z),GeodesicPos_(GeodesicPosition::LATITUDE),GeodesicPos_(GeodesicPosition::LONGITUDE),GeodesicPos_(GeodesicPosition::HEIGHT)); double lat, lon, h;
earth_->Reverse(GeocentricPos_(GeocentricPosition::X),GeocentricPos_(GeocentricPosition::Y),GeocentricPos_(GeocentricPosition::Z),GeodesicPos_(GeodesicPosition::LATITUDE),GeodesicPos_(GeodesicPosition::LONGITUDE),GeodesicPos_(GeodesicPosition::HEIGHT));
} }
void Position::setGeodesicPos(double lat, double lon, int height){ void Position::setGeodesicPos(double lat, double lon, int height){