Merge branches 'jmt/xmlauto', 'luff/kln89' and 'curt/radial'

[flightgear.git] / src / AIModel / AIFlightPlan.cxx

diff --git a/src/AIModel/AIFlightPlan.cxx b/src/AIModel/AIFlightPlan.cxx
index 5bdbdeb843430df68761064855c1a903d263d50b..381f9e94498f0680d44eaab337aa4a08005edf04 100644 (file)
--- a/src/AIModel/AIFlightPlan.cxx
+++ b/src/AIModel/AIFlightPlan.cxx
@@ -42,13 +42,19 @@
 #include <Environment/environment.hxx>
 
 #include "AIFlightPlan.hxx"
+#include "AIAircraft.hxx"
 
 using std::cerr;
 
+FGAIFlightPlan::FGAIFlightPlan() 
+{
+   sid = 0;
+}
 
 FGAIFlightPlan::FGAIFlightPlan(const string& filename)
 {
   int i;
+  sid = 0;
   start_time = 0;
   leg = 10;
   gateId = 0;
@@ -60,7 +66,7 @@ FGAIFlightPlan::FGAIFlightPlan(const string& filename)
 
   try {
       readProperties(path.str(), &root);
-  } catch (const sg_exception &e) {
+  } catch (const sg_exception &) {
       SG_LOG(SG_GENERAL, SG_ALERT,
        "Error reading AI flight plan: " << path.str());
        // cout << path.str() << endl;
@@ -101,7 +107,8 @@ FGAIFlightPlan::FGAIFlightPlan(const string& filename)
 // Position computed by the traffic manager, as well
 // as setting speeds and altitude computed by the
 // traffic manager. 
-FGAIFlightPlan::FGAIFlightPlan(const std::string& p,
+FGAIFlightPlan::FGAIFlightPlan(FGAIAircraft *ac,
+                               const std::string& p,
                               double course,
                               time_t start,
                               FGAirport *dep,
@@ -116,6 +123,7 @@ FGAIFlightPlan::FGAIFlightPlan(const std::string& p,
                               const string& acType,
                               const string& airline)
 {
+  sid = 0;
   repeat = false;
   leg = 10;
   gateId=0;
@@ -169,7 +177,7 @@ FGAIFlightPlan::FGAIFlightPlan(const std::string& p,
            waypoints.push_back(wpt);
          }
        }
-      catch (const sg_exception &e) {
+      catch (const sg_exception &) {
        SG_LOG(SG_GENERAL, SG_WARN,
               "Error reading AI flight plan: ");
        cerr << "Errno = " << errno << endl;
@@ -200,9 +208,9 @@ FGAIFlightPlan::FGAIFlightPlan(const std::string& p,
       if (timeDiff >= 2000)
           leg = 5;
 
-      SG_LOG(SG_GENERAL, SG_INFO, "Route from " << dep->getId() << " to " << arr->getId() << ". Set leg to : " << leg);
+      SG_LOG(SG_GENERAL, SG_INFO, "Route from " << dep->getId() << " to " << arr->getId() << ". Set leg to : " << leg << " " << ac->getTrafficRef()->getCallSign());
       wpt_iterator = waypoints.begin();
-      create(dep,arr, leg, alt, speed, lat, lon,
+      create(ac, dep,arr, leg, alt, speed, lat, lon,
             firstLeg, radius, fltType, acType, airline);
       wpt_iterator = waypoints.begin();
       //cerr << "after create: " << (*wpt_iterator)->name << endl;
@@ -358,6 +366,26 @@ void FGAIFlightPlan::IncrementWaypoint(bool eraseWaypoints )
 
 }
 
+void FGAIFlightPlan::DecrementWaypoint(bool eraseWaypoints )
+{
+    if (eraseWaypoints)
+    {
+        if (wpt_iterator == waypoints.end())
+            wpt_iterator--;
+        else
+        {
+            delete *(waypoints.end());
+            waypoints.erase(waypoints.end());
+            wpt_iterator = waypoints.end();
+            wpt_iterator--;
+        }
+    }
+    else
+        wpt_iterator--;
+
+}
+
+
 // gives distance in feet from a position to a waypoint
 double FGAIFlightPlan::getDistanceToGo(double lat, double lon, waypoint* wp) const{
   return SGGeodesy::distanceM(SGGeod::fromDeg(lon, lat), 
@@ -460,7 +488,7 @@ void FGAIFlightPlan::deleteTaxiRoute()
 
 
 int FGAIFlightPlan::getRouteIndex(int i) {
-  if ((i > 0) && (i < waypoints.size())) {
+  if ((i > 0) && (i < (int)waypoints.size())) {
     return waypoints[i]->routeIndex;
   }
   else