Moved random ground cover object management code (userdata.[ch]xx) over

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

diff --git a/src/ATC/ATCutils.cxx b/src/ATC/ATCutils.cxx
index 59b32f2ab5a15ac27d2bf9e2b75a1b1d97d87d7c..20a7819023af53bd2407db50e6e7d87959352728 100644 (file)
--- a/src/ATC/ATCutils.cxx
+++ b/src/ATC/ATCutils.cxx
@@ -80,7 +80,7 @@ string ConvertRwyNumToSpokenString(int n) {
        return(str);
 }
 
-// Assumes we get a two-digit string optionally appended with R or L
+// Assumes we get a two-digit string optionally appended with L, R or C
 // eg 01 07L 29R 36
 // Anything else is not guaranteed to be handled correctly!
 string ConvertRwyNumToSpokenString(string s) {
@@ -88,7 +88,16 @@ string ConvertRwyNumToSpokenString(string s) {
                return(ConvertRwyNumToSpokenString(atoi(s.c_str())));
        } else {
                string r = ConvertRwyNumToSpokenString(atoi(s.substr(0,2).c_str()));
-               return(r += (s.substr(2,1) == "L" ? " left" : " right"));       // Warning - not much error checking there!
+               if(s.substr(2,1) == "L") {
+                       r += " left";
+               } else if(s.substr(2,1) == "R") {
+                       r += " right";
+               } else if(s.substr(2,1) == "C") {
+                       r += " center";
+               } else {
+                       SG_LOG(SG_ATC, SG_WARN, "WARNING: Unknown suffix " << s.substr(2,1) << " from runway ID " << s << " in ConvertRwyNumToSpokenString(...)");
+               }
+               return(r);
        }
 }
        
@@ -128,6 +137,8 @@ string GetPhoneticIdent(int i) {
        return("Error");
 }
 
+//================================================================================================================
+
 // Given two positions (lat & lon in degrees), get the HORIZONTAL separation (in meters)
 double dclGetHorizontalSeparation(Point3D pos1, Point3D pos2) {
        double x;       //East-West separation
@@ -238,6 +249,19 @@ void dclBoundHeading(double &hdg) {
        }
 }
 
+// smallest difference between two angles in degrees
+// difference is negative if a1 > a2 and positive if a2 > a1
+double GetAngleDiff_deg( const double &a1, const double &a2) {
+  
+  double a3 = a2 - a1;
+  while (a3 < 180.0) a3 += 360.0;
+  while (a3 > 180.0) a3 -= 360.0;
+
+  return a3;
+}
+
+//================================================================================================================
+
 // Airport stuff.  The next two functions are straight copies of their fg.... equivalents
 // in fg_init.cxx, and are just here temporarily until some rationalisation occurs.
 // find basic airport location info from airport database
@@ -284,10 +308,10 @@ double dclGetAirportElev( const string& id ) {
 
 // Runway stuff
 // Given a Point3D (lon/lat/elev) and an FGRunway struct, determine if the point lies on the runway
-bool OnRunway(Point3D pt, FGRunway* rwy) {
+bool OnRunway(Point3D pt, const FGRunway& rwy) {
        FGATCAlignedProjection ortho;
-       Point3D centre(rwy->lon, rwy->lat, 0.0);        // We don't need the elev
-       ortho.Init(centre, rwy->heading);
+       Point3D centre(rwy.lon, rwy.lat, 0.0);  // We don't need the elev
+       ortho.Init(centre, rwy.heading);
        
        Point3D xyc = ortho.ConvertToLocal(centre);
        Point3D xyp = ortho.ConvertToLocal(pt);
@@ -295,8 +319,8 @@ bool OnRunway(Point3D pt, FGRunway* rwy) {
        //cout << "Length offset = " << fabs(xyp.y() - xyc.y()) << '\n';
        //cout << "Width offset = " << fabs(xyp.x() - xyc.x()) << '\n';
        
-       if((fabs(xyp.y() - xyc.y()) < ((rwy->length/2.0) + 5.0)) 
-               && (fabs(xyp.x() - xyc.x()) < (rwy->width/2.0))) {
+       if((fabs(xyp.y() - xyc.y()) < ((rwy.length/2.0) + 5.0)) 
+               && (fabs(xyp.x() - xyc.x()) < (rwy.width/2.0))) {
                return(true);
        }