Interim windows build fix

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

diff --git a/src/Airports/dynamics.hxx b/src/Airports/dynamics.hxx
index 007c8a780d36f2933ac1974cb703dad11d101517..cef41fa48434bb89a7e87dd3880faf5e0964a886 100644 (file)
--- a/src/Airports/dynamics.hxx
+++ b/src/Airports/dynamics.hxx
@@ -24,15 +24,15 @@
 
 #include <set>
 
+#include <simgear/structure/SGReferenced.hxx>
+
 #include <ATC/trafficcontrol.hxx>
+#include <ATC/GroundController.hxx>
+
+#include "airports_fwd.hxx"
 #include "parking.hxx"
-#include "groundnetwork.hxx"
 #include "runwayprefs.hxx"
 
-// forward decls
-class FGAirport;
-class FGEnvironment;
-
 class ParkingAssignment
 {
 public:
@@ -40,7 +40,7 @@ public:
   ~ParkingAssignment();
   
 // create a parking assignment (and mark it as unavailable)
-  ParkingAssignment(FGParking* pk, FGAirport* apt);
+  ParkingAssignment(FGParking* pk, FGAirportDynamics* apt);
   
   ParkingAssignment(const ParkingAssignment& aOther);
   void operator=(const ParkingAssignment& aOther);
@@ -56,20 +56,24 @@ private:
   ParkingAssignmentPrivate* _sharedData;
 };
 
-class FGAirportDynamics {
+class FGAirportDynamics : public SGReferenced
+{
 
 private:
     FGAirport* _ap;
 
-    typedef std::set<PositionedID> ParkingSet;
+    typedef std::set<FGParkingRef> ParkingSet;
     // if a parking item is in this set, it is occupied
     ParkingSet occupiedParkings;
 
+
+    std::auto_ptr<FGGroundNetwork> groundNetwork;
+
     FGRunwayPreference   rwyPrefs;
     FGStartupController  startupController;
-    FGGroundNetwork      groundNetwork;
     FGTowerController    towerController;
     FGApproachController approachController;
+    FGGroundController   groundController;
 
     time_t lastUpdate;
     std::string prevTrafficType;
@@ -96,7 +100,7 @@ private:
                                bool skipEmptyAirlineCode);
 public:
     FGAirportDynamics(FGAirport* ap);
-    ~FGAirportDynamics();
+    virtual ~FGAirportDynamics();
 
     void addAwosFreq     (int val) {
         freqAwos.push_back(val);
@@ -125,7 +129,10 @@ public:
     FGAirport* parent() const
     { return _ap; }
   
-    void getActiveRunway(const string& trafficType, int action, string& runway, double heading);
+    void getActiveRunway( const std::string& trafficType,
+                          int action,
+                          std::string& runway,
+                          double heading );
     
     /**
      * retrieve an available parking by GateID, or -1 if no suitable
@@ -134,13 +141,13 @@ public:
     ParkingAssignment getAvailableParking(double radius, const std::string& fltype,
                           const std::string& acType, const std::string& airline);
 
-    void setParkingAvailable(PositionedID guid, bool available);
+    void setParkingAvailable(FGParking* park, bool available);
   
-    bool isParkingAvailable(PositionedID parking) const;
+    bool isParkingAvailable(FGParking* parking) const;
   
-    FGParking *getParking(PositionedID i) const;
-    void releaseParking(PositionedID id);
-    std::string getParkingName(PositionedID i) const;
+    void releaseParking(FGParking* id);
+
+    FGParkingList getParkings(bool onlyAvailable, const std::string& type) const;
 
     /**
      * Find a parking gate index by name. Note names are often not unique
@@ -153,8 +160,8 @@ public:
     FGStartupController    *getStartupController()    {
         return &startupController;
     };
-    FGGroundNetwork        *getGroundNetwork()        {
-        return &groundNetwork;
+    FGGroundController        *getGroundController()        {
+        return &groundController;
     };
     FGTowerController      *getTowerController()      {
         return &towerController;
@@ -163,6 +170,11 @@ public:
         return &approachController;
     };
 
+    FGGroundNetwork* getGroundNetwork() const
+    {
+        return groundNetwork.get();
+    }
+
     int getGroundFrequency(unsigned leg);
     int getTowerFrequency  (unsigned nr);