mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-21 12:55:31 +08:00
committed by
Mathew Sutcliffe
parent
bf1837b414
commit
76e2421ba2
@@ -5,6 +5,11 @@
|
|||||||
|
|
||||||
#include "blackmisc/coordinategeodetic.h"
|
#include "blackmisc/coordinategeodetic.h"
|
||||||
#include "blackmisc/blackmiscfreefunctions.h"
|
#include "blackmisc/blackmiscfreefunctions.h"
|
||||||
|
#include "mathematics.h"
|
||||||
|
#include <QtCore/qmath.h>
|
||||||
|
|
||||||
|
using namespace BlackMisc::PhysicalQuantities;
|
||||||
|
using namespace BlackMisc::Math;
|
||||||
|
|
||||||
namespace BlackMisc
|
namespace BlackMisc
|
||||||
{
|
{
|
||||||
@@ -80,6 +85,15 @@ namespace BlackMisc
|
|||||||
return BlackMisc::calculateHash(hashs, "CCoordinateGeodetic");
|
return BlackMisc::calculateHash(hashs, "CCoordinateGeodetic");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* From WGS84 coordinates
|
||||||
|
*/
|
||||||
|
CCoordinateGeodetic CCoordinateGeodetic::fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const CLength height)
|
||||||
|
{
|
||||||
|
CLatitude lat = CLatitude::fromWgs84(latitudeWgs84);
|
||||||
|
CLongitude lon = CLongitude::fromWgs84(longitudeWgs84);
|
||||||
|
return CCoordinateGeodetic(lat, lon, height);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Great circle distance
|
* Great circle distance
|
||||||
|
|||||||
@@ -226,6 +226,15 @@ namespace BlackMisc
|
|||||||
* Register metadata
|
* Register metadata
|
||||||
*/
|
*/
|
||||||
static void registerMetadata();
|
static void registerMetadata();
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief Coordinate by WGS84 position data
|
||||||
|
* \param latitudeWgs84
|
||||||
|
* \param longitudeWgs84
|
||||||
|
* \param height
|
||||||
|
* \return
|
||||||
|
*/
|
||||||
|
static CCoordinateGeodetic fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const BlackMisc::PhysicalQuantities::CLength height = BlackMisc::PhysicalQuantities::CLength());
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
Reference in New Issue
Block a user