Cleanup, no functional change

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

diff --git a/src/ATC/atc_mgr.cxx b/src/ATC/atc_mgr.cxx
index dc5005e70b0d0826c661597bc88c73150d39ef31..416229ca7ee47bb7213919bc8e503c0c8f91d600 100644 (file)
--- a/src/ATC/atc_mgr.cxx
+++ b/src/ATC/atc_mgr.cxx
@@ -26,13 +26,14 @@
 
 #include <iostream>
 
-#include <simgear/math/SGMath.hxx>
 #include <Airports/dynamics.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Scenery/scenery.hxx>
 #include "atc_mgr.hxx"
 
 
+using std::string;
+
 FGATCManager::FGATCManager() {
     controller = 0;
     prevController = 0;
@@ -49,6 +50,8 @@ void FGATCManager::init() {
 
     int leg = 0;
 
+    trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true);
+
     // find a reasonable controller for our user's aircraft..
     // Let's start by working out the following three scenarios: 
     // Starting on ground at a parking position
@@ -75,7 +78,7 @@ void FGATCManager::init() {
     ai_ac.setLongitude( longitude );
     ai_ac.setLatitude ( latitude  );
     ai_ac.setAltitude ( altitude  );
-    ai_ac.setPerformance("jet_transport");
+    ai_ac.setPerformance("", "jet_transport");
 
     // NEXT UP: Create a traffic Schedule and fill that with appropriate information. This we can use to flight planning.
     // Note that these are currently only defaults. 
@@ -102,54 +105,60 @@ void FGATCManager::init() {
     FGAirport *apt = FGAirport::findByIdent(airport); 
     if (apt && onGround) {// && !runway.empty()) {
         FGAirportDynamics* dcs = apt->getDynamics();
-        int park_index = dcs->getNrOfParkings() - 1;
-        //cerr << "found information: " << runway << " " << airport << ": parking = " << parking << endl;
-        fp = new FGAIFlightPlan;
-        while (park_index >= 0 && dcs->getParkingName(park_index) != parking) park_index--;
+        ParkingAssignment pk(dcs->getParkingByName(parking));
+      
         // No valid parking location, so either at the runway or at a random location.
-        if (parking.empty() || (park_index < 0)) {
-            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));
-                leg = 3;
-                string fltType = "ga";
-                fp->setRunway(runway);
-                fp->createTakeOff(&ai_ac, false, apt, 0, fltType);
-                ai_ac.setTakeOffStatus(2);
-            } else {
-                // We're on the ground somewhere. Handle this case later.
-            }
-        } else {
+        if (pk.isValid()) {
+            fp = new FGAIFlightPlan;
             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);
-            FGParking* parking = dcs->getParking(park_index);
-            aircraftRadius = parking->getRadius();
-            string fltType = parking->getType(); // gate / ramp, ga, etc etc. 
+            aircraftRadius = pk.parking()->getRadius();
+            string fltType = pk.parking()->getType(); // gate / ramp, ga, etc etc.
             string aircraftType; // Unused.
             string airline;      // Currently used for gate selection, but a fallback mechanism will apply when not specified.
-            fp->setGate(park_index);
+            fp->setGate(pk);
             if (!(fp->createPushBack(&ai_ac,
-                               false, 
-                               apt, 
-                               latitude,
-                               longitude,
-                               aircraftRadius,
-                               fltType,
-                               aircraftType,
-                               airline))) {
+                                     false,
+                                     apt,
+                                     aircraftRadius,
+                                     fltType,
+                                     aircraftType,
+                                     airline))) {
                 controller = 0;
                 return;
             }
 
+            
+            
+        } else if (!runway.empty()) {
+            controller = apt->getDynamics()->getTowerController();
+            int stationFreq = apt->getDynamics()->getTowerFrequency(2);
+            if (stationFreq > 0)
+            {
+                //cerr << "Setting radio frequency to in airfrequency: " << stationFreq << endl;
+                fgSetDouble("/instrumentation/comm[0]/frequencies/selected-mhz", ((double) stationFreq / 100.0));
+            }
+            fp = new FGAIFlightPlan;
+            leg = 3;
+            string fltType = "ga";
+            fp->setRunway(runway);
+            fp->createTakeOff(&ai_ac, false, apt, 0, fltType);
+            ai_ac.setTakeOffStatus(2);
+        } else {
+                // We're on the ground somewhere. Handle this case later.
+        }
+        
+        if (fp) {
+            fp->getLastWaypoint()->setName( fp->getLastWaypoint()->getName() + string("legend"));
         }
-        fp->getLastWaypoint()->setName( fp->getLastWaypoint()->getName() + string("legend")); 
      } else {
         controller = 0;
      }
@@ -258,8 +267,7 @@ void FGATCManager::update ( double time ) {
         //string airport = fgGetString("/sim/presets/airport-id");
         //FGAirport *apt = FGAirport::findByIdent(airport); 
         // AT this stage we should update the flightplan, so that waypoint incrementing is conducted as well as leg loading. 
-       static SGPropertyNode_ptr trans_num = globals->get_props()->getNode("/sim/atc/transmission-num", true);
-            int n = trans_num->getIntValue();
+        int n = trans_num->getIntValue();
         if (n == 1) {
             //cerr << "Toggling ground network visibility " << networkVisible << endl;
             networkVisible = !networkVisible;