X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIFlightPlan.hxx;h=1de5658bdb8eb569a838445491c6b267555c2b5e;hb=b5ff87181c9ba37feb1e33f6adc932aab888adf0;hp=65e4c79073fa3e4b8c9e3baefcc1c468f4a54ae1;hpb=9cc92035b19c3407344398503a1ea570769aed85;p=flightgear.git

diff --git a/src/AIModel/AIFlightPlan.hxx b/src/AIModel/AIFlightPlan.hxx
index 65e4c7907..1de5658bd 100644
--- a/src/AIModel/AIFlightPlan.hxx
+++ b/src/AIModel/AIFlightPlan.hxx
@@ -55,6 +55,7 @@ public:
    bool on_ground;
     int routeIndex;  // For AI/ATC purposes;
    double time_sec;
+   double trackLength; // distance from previous waypoint (for AI purposes);
    string time;
 
   } waypoint;
@@ -81,6 +82,7 @@ public:
    waypoint* const getCurrentWaypoint( void ) const;
    waypoint* const getNextWaypoint( void ) const;
    void IncrementWaypoint( bool erase );
+   void DecrementWaypoint( bool erase );
 
    double getDistanceToGo(double lat, double lon, waypoint* wp) const;
    int getLeg () const { return leg;};
@@ -89,10 +91,12 @@ public:
    double getLeadDistance( void ) const {return lead_distance;}
    double getBearing(waypoint* previous, waypoint* next) const;
    double getBearing(double lat, double lon, waypoint* next) const;
+   double checkTrackLength(string wptName);
   time_t getStartTime() const { return start_time; }
+   time_t getArrivalTime() const { return arrivalTime; }
 
   void    create(FGAIAircraft *, FGAirport *dep, FGAirport *arr, int leg, double alt, double speed, double lat, double lon,
-		 bool firstLeg, double radius, const string& fltType, const string& aircraftType, const string& airline);
+		 bool firstLeg, double radius, const string& fltType, const string& aircraftType, const string& airline, double distance);
 
   void setLeg(int val) { leg = val;}
   void setTime(time_t st) { start_time = st; }
@@ -127,6 +131,7 @@ private:
   typedef vector <waypoint*> wpt_vector_type;
   typedef wpt_vector_type::const_iterator wpt_vector_iterator;
 
+
   wpt_vector_type       waypoints;
   wpt_vector_iterator   wpt_iterator;
 
@@ -135,6 +140,7 @@ private:
   double lead_distance;
   double leadInAngle;
   time_t start_time;
+  time_t arrivalTime;       // For AI/ATC purposes.
   int leg;
   int gateId, lastNodeVisited;
   string activeRunway;
@@ -147,8 +153,8 @@ private:
   void createTakeOff(FGAIAircraft *, bool, FGAirport *, double, const string&);
   void createClimb(FGAIAircraft *, bool, FGAirport *, double, double, const string&);
   void createCruise(FGAIAircraft *, bool, FGAirport*, FGAirport*, double, double, double, double, const string&);
-  void createDecent(FGAIAircraft *, FGAirport *, const string&);
-  void createLanding(FGAIAircraft *, FGAirport *);
+  void createDescent(FGAIAircraft *, FGAirport *,  double latitude, double longitude, double speed, double alt,const string&, double distance);
+  void createLanding(FGAIAircraft *, FGAirport *, const string&);
   void createParking(FGAIAircraft *, FGAirport *, double radius);
   void deleteWaypoints(); 
   void resetWaypoints();
@@ -157,6 +163,8 @@ private:
   void createDefaultLandingTaxi(FGAIAircraft *, FGAirport* aAirport);
   void createDefaultTakeoffTaxi(FGAIAircraft *, FGAirport* aAirport, FGRunway* aRunway);
   void createTakeoffTaxi(FGAIAircraft *, bool firstFlight, FGAirport *apt, double radius, const string& fltType, const string& acType, const string& airline);
+
+  double getTurnRadius(double, bool);
         
   waypoint* createOnGround(FGAIAircraft *, const std::string& aName, const SGGeod& aPos, double aElev, double aSpeed);
   waypoint* createInAir(FGAIAircraft *, const std::string& aName, const SGGeod& aPos, double aElev, double aSpeed);