Initial checkin.

[flightgear.git] / src / Airports / dynamics.cxx

diff --git a/src/Airports/dynamics.cxx b/src/Airports/dynamics.cxx
index def5007aeb9dea5ed05c2292734a7b324eca006f..a95c63399862b9c313bdbf7cb1d2e1f68e2b5d3e 100644 (file)
--- a/src/Airports/dynamics.cxx
+++ b/src/Airports/dynamics.cxx
@@ -39,7 +39,6 @@
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
 #include <Airports/runways.hxx>
-#include <simgear/xml/easyxml.hxx>
 
 #include STL_STRING
 #include <vector>
@@ -49,16 +48,13 @@ SG_USING_STD(vector);
 SG_USING_STD(sort);
 SG_USING_STD(random_shuffle);
 
-#include "parking.hxx"
-#include "groundnetwork.hxx"
-#include "runwayprefs.hxx"
 #include "dynamics.hxx"
 
 /********** FGAirport Dynamics *********************************************/
 
 FGAirportDynamics::FGAirportDynamics(double lat, double lon, double elev, string id) :
-  _latitude(lat),
   _longitude(lon),
+  _latitude(lat),
   _elevation(elev),
   _id(id)
 {
@@ -95,7 +91,6 @@ FGAirportDynamics::FGAirportDynamics(const FGAirportDynamics& other)
 // Destructor
 FGAirportDynamics::~FGAirportDynamics()
 {
-  
 }
 
 
@@ -113,6 +108,7 @@ void FGAirportDynamics::init()
   // add the gate positions to the ground network. 
   groundNetwork.addNodes(&parkings);
   groundNetwork.init();
+  groundNetwork .setTowerController(&towerController);
 }
 
 bool FGAirportDynamics::getAvailableParking(double *lat, double *lon, double *heading, int *gateId, double rad, const string &flType, const string &acType, const string &airline)
@@ -437,13 +433,11 @@ void  FGAirportDynamics::pi (const char * target, const char * data) {
 }
 
 void  FGAirportDynamics::warning (const char * message, int line, int column) {
-  //cout << "Warning: " << message << " (" << line << ',' << column << ')'   
-  //     << endl;
+  SG_LOG(SG_IO, SG_WARN, "Warning: " << message << " (" << line << ',' << column << ')');
 }
 
 void  FGAirportDynamics::error (const char * message, int line, int column) {
-  //cout << "Error: " << message << " (" << line << ',' << column << ')'
-  //     << endl;
+  SG_LOG(SG_IO, SG_ALERT, "Error: " << message << " (" << line << ',' << column << ')');
 }
 
 void FGAirportDynamics::setRwyUse(const FGRunwayPreference& ref)
@@ -471,11 +465,11 @@ void FGAirportDynamics::getActiveRunway(const string &trafficType, int action, s
       RunwayGroup *currRunwayGroup = 0;
       int nrActiveRunways = 0;
       time_t dayStart = fgGetLong("/sim/time/utc/day-seconds");
-      if (((dayStart - lastUpdate) > 600) || trafficType != prevTrafficType)
+      if ((abs((long)(dayStart - lastUpdate)) > 600) || trafficType != prevTrafficType)
        {
          landing.clear();
          takeoff.clear();
-         //lastUpdate = dayStart;
+         lastUpdate = dayStart;
          prevTrafficType = trafficType;
 
          FGEnvironment