Implement a persistent cache for navigation data.

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

diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index e64c549455f61b61d82fdfc153b4433f03f6926e..3b727c903cea81cd3bd47df09a63a545441d92c8 100644 (file)
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@@ -26,7 +26,6 @@
 
 #include <iostream>
 
-#include <simgear/math/SGMath.hxx>
 #include <Airports/dynamics.hxx>
 #include <Airports/simple.hxx>
 #include <Scenery/scenery.hxx>
@@ -111,8 +110,11 @@ void FGATCManager::init() {
             if (!runway.empty()) {
                 controller = apt->getDynamics()->getTowerController();
                 int stationFreq = apt->getDynamics()->getTowerFrequency(2);
-                //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
-                fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
+                if (stationFreq > 0)
+                {
+                    //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
+                    fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
+                }
                 leg = 3;
                 string fltType = "ga";
                 fp->setRunway(runway);
@@ -124,8 +126,11 @@ void FGATCManager::init() {
         } else {
             controller = apt->getDynamics()->getStartupController();
             int stationFreq = apt->getDynamics()->getGroundFrequency(1);
-            //cerr << "Setting radio frequency to : " << stationFreq << endl;
-            fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
+            if (stationFreq > 0)
+            {
+                //cerr << "Setting radio frequency to : " << stationFreq << endl;
+                fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
+            }
             leg = 1;
             //double, lat, lon, head; // Unused variables;
             //int getId = apt->getDynamics()->getParking(gateId, &lat, &lon, &head);
@@ -219,18 +224,23 @@ void FGATCManager::update ( double time ) {
     double speed     = fgGetDouble("/velocities/groundspeed-kt");
     double altitude  = fgGetDouble("/position/altitude-ft");
     
+    /*
     SGGeod me(SGGeod::fromDegM(longitude,
                                latitude,
                                altitude));
-    SGGeod wpt(SGGeod::fromDegM(fp->getWayPoint(1)->getLongitude(), 
+    SGGeod wpt1(SGGeod::fromDegM(fp->getWayPoint(1)->getLongitude(), 
                                 fp->getWayPoint(1)->getLatitude(),
                                 fp->getWayPoint(1)->getAltitude()));
+    SGGeod wpt2(SGGeod::fromDegM(fp->getWayPoint(1)->getLongitude(), 
+                                fp->getWayPoint(1)->getLatitude(),
+                                fp->getWayPoint(1)->getAltitude()));
+        
+    double course1, az1, dist1;
+    double course2, az2, dist2;
+    SGGeodesy::inverse(me, wpt1, course1, az1, dist1);
     
-    double course, az2, dist;
-    SGGeodesy::inverse(me, wpt, course, az2, dist);
-    
-    cerr << "Bearing to nearest waypoint : " << course << endl;
-    
+    cerr << "Bearing to nearest waypoint : " << course1 << " " << dist1 << ". (course " << course2 << ")." <<  endl;
+    */
     ai_ac.setLatitude(latitude);
     ai_ac.setLongitude(longitude);
     ai_ac.setAltitude(altitude);