Make sure the ATIS reports surface winds at airports above sea-level

[flightgear.git] / src / ATC / ATCProjection.cxx

diff --git a/src/ATC/ATCProjection.cxx b/src/ATC/ATCProjection.cxx
index 02e7b0ddeed998766534a753030afa28f74537ff..257ea544483cc492a51381f5beccdcc6f59e8aa8 100644 (file)
--- a/src/ATC/ATCProjection.cxx
+++ b/src/ATC/ATCProjection.cxx
@@ -22,6 +22,9 @@
 #include <math.h>
 #include <simgear/constants.h>
 
+#include <iostream>
+SG_USING_STD(cout);
+
 #define DCL_PI  3.1415926535f
 //#define SG_PI  ((SGfloat) M_PI)
 #define DCL_DEGREES_TO_RADIANS  (DCL_PI/180.0)
@@ -53,7 +56,10 @@ Point3D FGATCProjection::ConvertToLocal(Point3D pt) {
 }
 
 Point3D FGATCProjection::ConvertFromLocal(Point3D pt) {
-    return(Point3D(0,0,0));
+       double delta_lat = asin(pt.y() / SG_EQUATORIAL_RADIUS_M) * DCL_RADIANS_TO_DEGREES;
+       double delta_lon = (asin(pt.x() / SG_EQUATORIAL_RADIUS_M) * DCL_RADIANS_TO_DEGREES) / correction_factor;
+       
+    return(Point3D(origin.lon()+delta_lon, origin.lat()+delta_lat, 0.0));
 }
 
 /**********************************************************************************/
@@ -80,17 +86,26 @@ Point3D FGATCAlignedProjection::ConvertToLocal(Point3D pt) {
     double delta_lon = pt.lon() - origin.lon();
     double y = sin(delta_lat * DCL_DEGREES_TO_RADIANS) * SG_EQUATORIAL_RADIUS_M;
     double x = sin(delta_lon * DCL_DEGREES_TO_RADIANS) * SG_EQUATORIAL_RADIUS_M * correction_factor;
-    //cout << "Before alignment, x = " << x << " y = " << y << '\n';
 
     // Align
     double xbar = x;
     x = x*cos(theta) - y*sin(theta);
     y = (xbar*sin(theta)) + (y*cos(theta));
-    //cout << "After alignment, x = " << x << " y = " << y << '\n';
 
-    return(Point3D(x,y,0.0));
+    return(Point3D(x,y,pt.elev()));
 }
 
 Point3D FGATCAlignedProjection::ConvertFromLocal(Point3D pt) {
-    return(Point3D(0,0,0));
+       //cout << "theta = " << theta << '\n';
+       //cout << "origin = " << origin << '\n';
+    // de-align
+    double thi = theta * -1.0;
+    double x = pt.x()*cos(thi) - pt.y()*sin(thi);
+    double y = (pt.x()*sin(thi)) + (pt.y()*cos(thi));
+
+    // convert from orthogonal to lat/lon
+    double delta_lat = asin(y / SG_EQUATORIAL_RADIUS_M) * DCL_RADIANS_TO_DEGREES;
+    double delta_lon = (asin(x / SG_EQUATORIAL_RADIUS_M) * DCL_RADIANS_TO_DEGREES) / correction_factor;
+
+    return(Point3D(origin.lon()+delta_lon, origin.lat()+delta_lat, pt.elev()));
 }