Some cleanup in the ATC/AI code before merging with the next branch:

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

diff --git a/src/Airports/dynamics.hxx b/src/Airports/dynamics.hxx
index 1f142eb529bd36e9f0d0477e4ea382ec6d49f9a9..d3dbedaa27b50256e600b5215632e7bf0cf1f1a3 100644 (file)
--- a/src/Airports/dynamics.hxx
+++ b/src/Airports/dynamics.hxx
@@ -22,39 +22,31 @@
 #ifndef _AIRPORT_DYNAMICS_HXX_
 #define _AIRPORT_DYNAMICS_HXX_
 
-
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
-#include <simgear/xml/easyxml.hxx>
-
 #include <ATC/trafficcontrol.hxx>
 #include "parking.hxx"
 #include "groundnetwork.hxx"
 #include "runwayprefs.hxx"
 #include "sidstar.hxx"
 
-//typedef vector<float> DoubleVec;
-//typedef vector<float>::iterator DoubleVecIterator;
-
+// forward decls
 class FGAirport;
-
+class FGEnvironment;
 
 class FGAirportDynamics {
 
 private:
   FGAirport* _ap;
 
-  FGParkingVec        parkings;
-  FGRunwayPreference  rwyPrefs;
-  FGSidStar           SIDs;
-  FGStartupController startupController;
-  FGGroundNetwork     groundNetwork;
-  FGTowerController   towerController;
+  FGParkingVec         parkings;
+  FGRunwayPreference   rwyPrefs;
+  FGSidStar            SIDs;
+  FGStartupController  startupController;
+  FGGroundNetwork      groundNetwork;
+  FGTowerController    towerController;
+  FGApproachController approachController;
 
   time_t lastUpdate;
-  string prevTrafficType;
+  std::string prevTrafficType;
   stringVec landing;
   stringVec takeoff;
   stringVec milActive, comActive, genActive, ulActive;
@@ -66,14 +58,17 @@ private:
   intVec freqTower;    // </TOWER>
   intVec freqApproach; // </APPROACH>
 
-  string atisInformation;
+  int atisSequenceIndex;
+  double atisSequenceTimeStamp;
+  
+  std::string chooseRunwayFallback();
+  bool innerGetActiveRunway(const std::string &trafficType, int action, std::string &runway, double heading);
+  std::string chooseRwyByHeading(stringVec rwys, double heading);
+
+  double elevation;
 
-  string chooseRunwayFallback();
-  bool innerGetActiveRunway(const string &trafficType, int action, string &runway, double heading);
-  string chooseRwyByHeading(stringVec rwys, double heading);
 public:
   FGAirportDynamics(FGAirport* ap);
-  FGAirportDynamics(const FGAirportDynamics &other);
   ~FGAirportDynamics();
 
   void addAwosFreq     (int val) { freqAwos.push_back(val);      };
@@ -112,12 +107,19 @@ public:
 
 
   // ATC related functions. 
-  FGStartupController *getStartupController() { return &startupController; };
-  FGGroundNetwork     *getGroundNetwork()     { return &groundNetwork; };
-  FGTowerController   *getTowerController()   { return &towerController; };
+  FGStartupController    *getStartupController()    { return &startupController; };
+  FGGroundNetwork        *getGroundNetwork()        { return &groundNetwork; };
+  FGTowerController      *getTowerController()      { return &towerController; };
+  FGApproachController   *getApproachController()   { return &approachController; };
+
+  int getGroundFrequency(unsigned leg);
+  int getTowerFrequency  (unsigned nr);
+  
+  /// get current ATIS sequence letter
+  const std::string getAtisSequence();
 
-  const string& getAtisInformation() { return atisInformation; };
-  int getGroundFrequency(unsigned leg); //{ return freqGround.size() ? freqGround[0] : 0; };
+  /// get the current ATIS sequence number, updating it if necessary
+  int updateAtisSequence(int interval, bool forceUpdate);
 
   void setRwyUse(const FGRunwayPreference& ref);
 };