X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAIModel%2FAIFlightPlan.hxx;h=1de5658bdb8eb569a838445491c6b267555c2b5e;hb=afbc360eeded20d4447ab005ee0e234a43f068cd;hp=50ba8d6f110218c5e66147e0883c7e6950edc78f;hpb=d24fe199143c3cd0adecd74f02430125e2bad45e;p=flightgear.git

diff --git a/src/AIModel/AIFlightPlan.hxx b/src/AIModel/AIFlightPlan.hxx
index 50ba8d6f1..1de5658bd 100644
--- a/src/AIModel/AIFlightPlan.hxx
+++ b/src/AIModel/AIFlightPlan.hxx
@@ -55,10 +55,11 @@ 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;
-
+  FGAIFlightPlan();
   FGAIFlightPlan(const string& filename);
   FGAIFlightPlan(FGAIAircraft *,
                  const std::string& p,
@@ -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; }
@@ -113,11 +117,21 @@ public:
   void setRunway(string rwy) { activeRunway = rwy; };
   string getRunwayClassFromTrafficType(string fltType);
 
+  void addWaypoint(waypoint* wpt) { waypoints.push_back(wpt); };
+
+  void setName(string n) { name = n; };
+  string getName() { return name; };
+
+  void setSID(FGAIFlightPlan* fp) { sid = fp;};
+  FGAIFlightPlan* getSID() { return sid; };
+
 private:
   FGRunway* rwy;
+  FGAIFlightPlan *sid;
   typedef vector <waypoint*> wpt_vector_type;
   typedef wpt_vector_type::const_iterator wpt_vector_iterator;
 
+
   wpt_vector_type       waypoints;
   wpt_vector_iterator   wpt_iterator;
 
@@ -126,19 +140,21 @@ private:
   double lead_distance;
   double leadInAngle;
   time_t start_time;
+  time_t arrivalTime;       // For AI/ATC purposes.
   int leg;
   int gateId, lastNodeVisited;
   string activeRunway;
   FGAirRoute airRoute;
   FGTaxiRoute *taxiRoute;
+  string name;
 
   void createPushBack(FGAIAircraft *, bool, FGAirport*, double, double, double, const string&, const string&, const string&);
   void createPushBackFallBack(FGAIAircraft *, bool, FGAirport*, double, double, double, const string&, const string&, const string&);
   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();
@@ -147,15 +163,21 @@ 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);
   waypoint* cloneWithPos(FGAIAircraft *, waypoint* aWpt, const std::string& aName, const SGGeod& aPos);
+  waypoint* clone(waypoint* aWpt);
     
 
   //void createCruiseFallback(bool, FGAirport*, FGAirport*, double, double, double, double);
  void evaluateRoutePart(double deplat, double deplon, double arrlat, double arrlon);
- 
+ public:
+  wpt_vector_iterator getFirstWayPoint() { return waypoints.begin(); };
+  wpt_vector_iterator getLastWayPoint()  { return waypoints.end(); };
+
 };    
 
 #endif  // _FG_AIFLIGHTPLAN_HXX