Port over remaining Point3D usage to the more type and unit safe SG* classes.

[flightgear.git] / src / ATCDCL / ATCutils.hxx

diff --git a/src/ATCDCL/ATCutils.hxx b/src/ATCDCL/ATCutils.hxx
index c47c3469a0f5e9220b40314d75362606cf5688e0..b26a55cd0b0b01c22ed9be353e060a55e25ab0ce 100644 (file)
--- a/src/ATCDCL/ATCutils.hxx
+++ b/src/ATCDCL/ATCutils.hxx
@@ -21,8 +21,8 @@
 #include <Airports/simple.hxx>
 #include <Airports/runways.hxx>
 
+#include <simgear/math/SGMath.hxx>
 #include <math.h>
-#include <simgear/math/point3d.hxx>
 #include <string>
 using std::string;
 
@@ -72,7 +72,7 @@ string GetCompassDirection(double h);
 ********************************/
 
 // Given two positions (lat & lon in degrees), get the HORIZONTAL separation (in meters)
-double dclGetHorizontalSeparation(const Point3D& pos1, const Point3D& pos2);
+double dclGetHorizontalSeparation(const SGGeod& pos1, const SGGeod& pos2);
 
 // Given a point and a line, get the HORIZONTAL shortest distance from the point to a point on the line.
 // Expects to be fed orthogonal co-ordinates, NOT lat & lon !
@@ -80,10 +80,10 @@ double dclGetLinePointSeparation(double px, double py, double x1, double y1, dou
 
 // Given a position (lat/lon/elev), heading, vertical angle, and distance, calculate the new position.
 // Assumes that the ground is not hit!!!  Expects heading and angle in degrees, distance in meters.
-Point3D dclUpdatePosition(const Point3D& pos, double heading, double angle, double distance);
+SGGeod dclUpdatePosition(const SGGeod& pos, double heading, double angle, double distance);
 
 // Get a heading from one lat/lon to another (in degrees)
-double GetHeadingFromTo(const Point3D& A, const Point3D& B);
+double GetHeadingFromTo(const SGGeod& A, const SGGeod& B);
 
 // Given a heading (in degrees), bound it from 0 -> 360
 void dclBoundHeading(double &hdg);
@@ -98,6 +98,6 @@ double GetAngleDiff_deg( const double &a1, const double &a2);
 *
 ****************/
 
-// Given a Point3D (lon/lat/elev) and an FGRunway struct, determine if the point lies on the runway
-bool OnRunway(const Point3D& pt, const FGRunwayBase* rwy);
+// Given (lon/lat/elev) and an FGRunway struct, determine if the point lies on the runway
+bool OnRunway(const SGGeod& pt, const FGRunwayBase* rwy);