Clean-up: move autosave.xml loading code to proper method

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

diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index 78328ee5e1d50c26e3177052d52de9525ce2386e..dc5005e70b0d0826c661597bc88c73150d39ef31 100644 (file)
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@@ -188,21 +188,28 @@ void FGATCManager::update ( double time ) {
     FGAIFlightPlan *fp = ai_ac.GetFlightPlan();
         
     /* test code : find out how the routing develops */
-    /*if (fp) {
+    if (fp) {
         int size = fp->getNrOfWayPoints();
         //cerr << "Setting pos" << pos << " ";
         //cerr << "setting intentions " ;
-        cerr << "Size of waypoint cue " << size << " ";
-        for (int i = 0; i < size; i++) {
-            int val = fp->getRouteIndex(i);
-            cerr << fp->getWayPoint(i)->getName() << " ";
+        // This indicates that we have run out of waypoints: Im future versions, the
+        // user should be able to select a new route, but for now just shut down the
+        // system. 
+        if (size < 3) {
+            //cerr << "Shutting down the atc_mgr" << endl;
+            return;
+        }
+        //cerr << "Size of waypoint cue " << size << " ";
+        //for (int i = 0; i < size; i++) {
+        //    int val = fp->getRouteIndex(i);
+            //cerr << fp->getWayPoint(i)->getName() << " ";
             //if ((val) && (val != pos)) {
                 //intentions.push_back(val);
                 //cerr << "[done ] " << endl;
             //}
-        }
-        cerr << "[done ] " << endl;
-    }*/
+        //}
+        //cerr << "[done ] " << endl;
+    }
     if (fp) {
         //cerr << "Currently at leg : " << fp->getLeg() << endl;
     }
@@ -212,18 +219,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);