updated Position with distance calc
This commit is contained in:
@@ -23,7 +23,7 @@ namespace SimCore {
|
|||||||
* @return Eigen::Vector3d
|
* @return Eigen::Vector3d
|
||||||
*/
|
*/
|
||||||
Eigen::Vector3d getGeocentricPos();
|
Eigen::Vector3d getGeocentricPos();
|
||||||
|
void getGeocentricPos(double &lat, double &lon,double &h);
|
||||||
/**
|
/**
|
||||||
* @brief returns a eigen vector3d with the lat, lon, height coordinates
|
* @brief returns a eigen vector3d with the lat, lon, height coordinates
|
||||||
* @return Eigen::Vector3d
|
* @return Eigen::Vector3d
|
||||||
@@ -33,9 +33,13 @@ namespace SimCore {
|
|||||||
void setGeocentricPos(double X, double Y, double Z);
|
void setGeocentricPos(double X, double Y, double Z);
|
||||||
void setGeodesicPos(double lat, double lon, int height);
|
void setGeodesicPos(double lat, double lon, int height);
|
||||||
|
|
||||||
bool operator== ( Position &lhs);
|
|
||||||
|
|
||||||
|
double distanceToPosition(Position &p2);
|
||||||
|
|
||||||
|
|
||||||
|
bool operator== ( Position &lhs);
|
||||||
Position& operator=(const Position other);
|
Position& operator=(const Position other);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Submodule libs/whisper-com updated: 3474cbd5cb...97d3a10e8c
@@ -35,6 +35,16 @@ namespace SimCore {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Position::getGeocentricPos(double &lat, double &lon,double &h)
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(mx);
|
||||||
|
lat = GeodesicPos_[LATITUDE];
|
||||||
|
lon = GeodesicPos_[LONGITUDE];
|
||||||
|
h = GeodesicPos_[HEIGHT];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Eigen::Vector3d Position::getGeodesicPos()
|
Eigen::Vector3d Position::getGeodesicPos()
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(mx);
|
std::lock_guard<std::mutex> lock(mx);
|
||||||
@@ -61,6 +71,22 @@ namespace SimCore {
|
|||||||
earth_->Forward( GeodesicPos_(GeodesicPosition::LATITUDE),GeodesicPos_(GeodesicPosition::LONGITUDE),GeodesicPos_(GeodesicPosition::HEIGHT),GeocentricPos_(0),GeocentricPos_(1),GeocentricPos_(2));
|
earth_->Forward( GeodesicPos_(GeodesicPosition::LATITUDE),GeodesicPos_(GeodesicPosition::LONGITUDE),GeodesicPos_(GeodesicPosition::HEIGHT),GeocentricPos_(0),GeocentricPos_(1),GeocentricPos_(2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
double Position::distanceToPosition(Position &p2)
|
||||||
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(mx);
|
||||||
|
double s12, azi1, azi2, m12;
|
||||||
|
geod_->Inverse(this->GeodesicPos_[LATITUDE],
|
||||||
|
this->GeodesicPos_[LONGITUDE],
|
||||||
|
p2.GeodesicPos_[LATITUDE],
|
||||||
|
p2.GeodesicPos_[LONGITUDE],
|
||||||
|
s12,azi1,azi2,m12);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool Position::operator==( Position &lhs)
|
bool Position::operator==( Position &lhs)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(mx);
|
std::lock_guard<std::mutex> lock(mx);
|
||||||
|
|||||||
Reference in New Issue
Block a user