]> git.mxchange.org Git - flightgear.git/blobdiff - src/AIModel/AIFlightPlanCreate.cxx
Make FGTaxiNode and FGParking inherit FGPositioned.
[flightgear.git] / src / AIModel / AIFlightPlanCreate.cxx
index 77032b3fac87aff29b8eb954dbd38e3df23621e2..c49b4abe8a6c7504e764ec779c22d4c63c5beb7b 100644 (file)
 #  include <config.h>
 #endif
 
+#include <cstdlib>
+
 #include "AIFlightPlan.hxx"
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
 
+#include <Airports/simple.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/dynamics.hxx>
 #include "AIAircraft.hxx"
@@ -34,6 +37,7 @@
 
 #include <Environment/environment_mgr.hxx>
 #include <Environment/environment.hxx>
+#include <FDM/LaRCsim/basic_aero.h>
 
 
 /* FGAIFlightPlan::create()
  *
  * This is the top-level function, and the only one that is publicly available.
  *
- */ 
+ */
 
 
 // Check lat/lon values during initialization;
-void FGAIFlightPlan::create(FGAIAircraft *ac, FGAirport *dep, FGAirport *arr, int legNr, 
-                           double alt, double speed, double latitude, 
-                           double longitude, bool firstFlight,double radius, 
-                           const string& fltType, const string& aircraftType, 
-                           const string& airline)
-{ 
-  int currWpt = wpt_iterator - waypoints.begin();
-  switch(legNr)
-    {
-      case 1:
-      createPushBack(ac, firstFlight,dep, latitude, longitude, 
-                    radius, fltType, aircraftType, airline);
-      break;
-    case 2: 
-      createTakeoffTaxi(ac, firstFlight, dep, radius, fltType, aircraftType, airline);
-      break;
-    case 3: 
-      createTakeOff(ac, firstFlight, dep, speed, fltType);
-      break;
-    case 4: 
-      createClimb(ac, firstFlight, dep, speed, alt, fltType);
-      break;
-    case 5: 
-      createCruise(ac, firstFlight, dep,arr, latitude, longitude, speed, alt, fltType);
-      break;
-    case 6: 
-      createDecent(ac, arr, fltType);
-      break;
-    case 7: 
-      createLanding(ac, arr);
-      break;
-    case 8: 
-      createLandingTaxi(ac, arr, radius, fltType, aircraftType, airline);
-      break;
-      case 9: 
-       createParking(ac, arr, radius);
-      break;
+bool FGAIFlightPlan::create(FGAIAircraft * ac, FGAirport * dep,
+                            FGAirport * arr, int legNr, double alt,
+                            double speed, double latitude,
+                            double longitude, bool firstFlight,
+                            double radius, const string & fltType,
+                            const string & aircraftType,
+                            const string & airline, double distance)
+{
+    bool retVal = true;
+    int currWpt = wpt_iterator - waypoints.begin();
+    switch (legNr) {
+    case 1:
+        retVal = createPushBack(ac, firstFlight, dep,
+                                radius, fltType, aircraftType, airline);
+        // Pregenerate the taxi leg.
+        //if (retVal) {
+        //    waypoints.back()->setName( waypoints.back()->getName() + string("legend")); 
+        //    retVal = createTakeoffTaxi(ac, false, dep, radius, fltType, aircraftType, airline);
+        //}
+        break;
+    case 2:
+        retVal =  createTakeoffTaxi(ac, firstFlight, dep, radius, fltType,
+                          aircraftType, airline);
+        break;
+    case 3:
+        retVal = createTakeOff(ac, firstFlight, dep, speed, fltType);
+        break;
+    case 4:
+        retVal = createClimb(ac, firstFlight, dep, speed, alt, fltType);
+        break;
+    case 5:
+        retVal = createCruise(ac, firstFlight, dep, arr, latitude, longitude, speed,
+                     alt, fltType);
+        break;
+    case 6:
+        retVal = createDescent(ac, arr, latitude, longitude, speed, alt, fltType,
+                      distance);
+        break;
+    case 7:
+        retVal = createLanding(ac, arr, fltType);
+        break;
+    case 8:
+        retVal = createLandingTaxi(ac, arr, radius, fltType, aircraftType, airline);
+        break;
+    case 9:
+        retVal = createParking(ac, arr, radius);
+        break;
     default:
-      //exit(1);
-      SG_LOG(SG_INPUT, SG_ALERT, "AIFlightPlan::create() attempting to create unknown leg"
-            " this is probably an internal program error");
+        //exit(1);
+        SG_LOG(SG_AI, SG_ALERT,
+               "AIFlightPlan::create() attempting to create unknown leg"
+               " this is probably an internal program error");
     }
-  wpt_iterator = waypoints.begin()+currWpt;
-  leg++;
+    wpt_iterator = waypoints.begin() + currWpt;
+    //don't  increment leg right away, but only once we pass the actual last waypoint that was created.
+    // to do so, mark the last waypoint with a special status flag
+   if (retVal) {
+        waypoints.back()->setName( waypoints.back()->getName() + string("legend")); 
+        // "It's pronounced Leg-end" (Roger Glover (Deep Purple): come Hell or High Water DvD, 1993)
+   }
+
+
+    //leg++;
+    return retVal;
 }
 
-FGAIFlightPlan::waypoint*
-FGAIFlightPlan::createOnGround(FGAIAircraft *ac, const std::string& aName, const SGGeod& aPos, double aElev, double aSpeed)
+FGAIWaypoint * FGAIFlightPlan::createOnGround(FGAIAircraft * ac,
+                                   const std::string & aName,
+                                   const SGGeod & aPos, double aElev,
+                                   double aSpeed)
 {
-  waypoint* wpt = new waypoint;
-  wpt->name = aName;
-  wpt->longitude = aPos.getLongitudeDeg();
-  wpt->latitude = aPos.getLatitudeDeg();
-  wpt->altitude  = aElev;
-  wpt->speed     = aSpeed; 
-  wpt->crossat   = -10000;
-  wpt->gear_down = true;
-  wpt->flaps_down= true;
-  wpt->finished  = false;
-  wpt->on_ground = true;
-  wpt->routeIndex= 0;
-  return wpt;
+    FGAIWaypoint *wpt  = new FGAIWaypoint;
+    wpt->setName       (aName                  );
+    wpt->setLongitude  (aPos.getLongitudeDeg() );
+    wpt->setLatitude   (aPos.getLatitudeDeg()  );
+    wpt->setAltitude   (aElev                  );
+    wpt->setSpeed      (aSpeed                 );
+    wpt->setCrossat    (-10000.1               );
+    wpt->setGear_down  (true                   );
+    wpt->setFlaps_down (true                   );
+    wpt->setFinished   (false                  );
+    wpt->setOn_ground  (true                   );
+    wpt->setRouteIndex (0                      );
+    return wpt;
 }
 
-FGAIFlightPlan::waypoint*
-FGAIFlightPlan::createInAir(FGAIAircraft *ac, const std::string& aName, const SGGeod& aPos, double aElev, double aSpeed)
+FGAIWaypoint *    FGAIFlightPlan::createInAir(FGAIAircraft * ac,
+                                const std::string & aName,
+                                const SGGeod & aPos, double aElev,
+                                double aSpeed)
 {
-  waypoint* wpt = new waypoint;
-  wpt->name = aName;
-  wpt->longitude = aPos.getLongitudeDeg();
-  wpt->latitude = aPos.getLatitudeDeg();
-  wpt->altitude  = aElev;
-  wpt->speed     = aSpeed; 
-  wpt->crossat   = -10000;
-  wpt->gear_down = false;
-  wpt->flaps_down= false;
-  wpt->finished  = false;
-  wpt->on_ground = false;
-  wpt->routeIndex= 0;
-  return wpt;
+    FGAIWaypoint * wpt = createOnGround(ac, aName, aPos, aElev, aSpeed);
+    wpt->setGear_down  (false                   );
+    wpt->setFlaps_down (false                   );
+    wpt->setOn_ground  (false                   );
+    return wpt;
 }
 
-FGAIFlightPlan::waypoint*
-FGAIFlightPlan::cloneWithPos(FGAIAircraft *ac, waypoint* aWpt, const std::string& aName, const SGGeod& aPos)
+FGAIWaypoint * FGAIFlightPlan::clone(FGAIWaypoint * aWpt)
 {
-  waypoint* wpt = new waypoint;
-  wpt->name = aName;
-  wpt->longitude = aPos.getLongitudeDeg();
-  wpt->latitude = aPos.getLatitudeDeg();
-  
-  wpt->altitude  = aWpt->altitude;
-  wpt->speed     = aWpt->speed; 
-  wpt->crossat   = aWpt->crossat;
-  wpt->gear_down = aWpt->gear_down;
-  wpt->flaps_down= aWpt->flaps_down;
-  wpt->finished  = aWpt->finished;
-  wpt->on_ground = aWpt->on_ground;
-  wpt->routeIndex = 0;
-  
-  return wpt;
+    FGAIWaypoint *wpt = new FGAIWaypoint;
+    wpt->setName       ( aWpt->getName ()      );
+    wpt->setLongitude  ( aWpt->getLongitude()  );
+    wpt->setLatitude   ( aWpt->getLatitude()   );
+    wpt->setAltitude   ( aWpt->getAltitude()   );
+    wpt->setSpeed      ( aWpt->getSpeed()      );
+    wpt->setCrossat    ( aWpt->getCrossat()    );
+    wpt->setGear_down  ( aWpt->getGear_down()  );
+    wpt->setFlaps_down ( aWpt->getFlaps_down() );
+    wpt->setFinished   ( aWpt->isFinished()    );
+    wpt->setOn_ground  ( aWpt->getOn_ground()  );
+    wpt->setRouteIndex ( 0                     );
+
+    return wpt;
 }
 
-FGAIFlightPlan::waypoint*
-FGAIFlightPlan::clone(waypoint* aWpt)
+
+FGAIWaypoint * FGAIFlightPlan::cloneWithPos(FGAIAircraft * ac, FGAIWaypoint * aWpt,
+                                 const std::string & aName,
+                                 const SGGeod & aPos)
 {
-  waypoint* wpt  = new waypoint;
-  wpt->name      = aWpt->name;
-  wpt->longitude = aWpt->longitude;
-  wpt->latitude  = aWpt->latitude;
-
-  wpt->altitude  = aWpt->altitude;
-  wpt->speed     = aWpt->speed; 
-  wpt->crossat   = aWpt->crossat;
-  wpt->gear_down = aWpt->gear_down;
-  wpt->flaps_down= aWpt->flaps_down;
-  wpt->finished  = aWpt->finished;
-  wpt->on_ground = aWpt->on_ground;
-  wpt->routeIndex = 0;
-  
-  return wpt;
+    FGAIWaypoint *wpt = clone(aWpt);
+    wpt->setName       ( aName                   );
+    wpt->setLongitude  ( aPos.getLongitudeDeg () );
+    wpt->setLatitude   ( aPos.getLatitudeDeg  () );
+
+    return wpt;
 }
 
 
-void FGAIFlightPlan::createDefaultTakeoffTaxi(FGAIAircraft *ac, FGAirport* aAirport, FGRunway* aRunway)
+
+void FGAIFlightPlan::createDefaultTakeoffTaxi(FGAIAircraft * ac,
+                                              FGAirport * aAirport,
+                                              FGRunway * aRunway)
 {
-  SGGeod runwayTakeoff = aRunway->pointOnCenterline(5.0);
-  double airportElev = aAirport->getElevation();
-  
-  waypoint* wpt;
-  wpt = createOnGround(ac, "Airport Center", aAirport->geod(), airportElev, 15);
-  waypoints.push_back(wpt);
-  wpt = createOnGround(ac, "Runway Takeoff", runwayTakeoff, airportElev, 15);
-  waypoints.push_back(wpt);    
+    SGGeod runwayTakeoff = aRunway->pointOnCenterline(5.0);
+    double airportElev = aAirport->getElevation();
+
+    FGAIWaypoint *wpt;
+    wpt =
+        createOnGround(ac, "Airport Center", aAirport->geod(), airportElev,
+                       ac->getPerformance()->vTaxi());
+    pushBackWaypoint(wpt);
+    wpt =
+        createOnGround(ac, "Runway Takeoff", runwayTakeoff, airportElev,
+                       ac->getPerformance()->vTaxi());
+    pushBackWaypoint(wpt);
 }
 
-void FGAIFlightPlan::createTakeoffTaxi(FGAIAircraft *ac, bool firstFlight, 
-                               FGAirport *apt,
-                               double radius, const string& fltType, 
-                               const string& acType, const string& airline)
+bool FGAIFlightPlan::createTakeoffTaxi(FGAIAircraft * ac, bool firstFlight,
+                                       FGAirport * apt,
+                                       double radius,
+                                       const string & fltType,
+                                       const string & acType,
+                                       const string & airline)
 {
-  double heading, lat, lon;
-  
-  // If this function is called during initialization,
-  // make sure we obtain a valid gate ID first
-  // and place the model at the location of the gate.
-  if (firstFlight) {
-    if (!(apt->getDynamics()->getAvailableParking(&lat, &lon, 
-              &heading, &gateId, 
-              radius, fltType, 
-              acType, airline)))
+
+    // If this function is called during initialization,
+    // make sure we obtain a valid gate ID first
+    // and place the model at the location of the gate.
+    if (firstFlight)
     {
-      SG_LOG(SG_INPUT, SG_WARN, "Could not find parking for a " << 
-       acType <<
-       " of flight type " << fltType <<
-       " of airline     " << airline <<
-       " at airport     " << apt->getId());
+      gateId =  apt->getDynamics()->getAvailableParking(radius, fltType,
+                                                        acType, airline);
+      if (gateId < 0) {
+        SG_LOG(SG_AI, SG_WARN, "Could not find parking for a " <<
+               acType <<
+               " of flight type " << fltType <<
+               " of airline     " << airline <<
+               " at airport     " << apt->getId());
+      }
     }
-  }
-  
-  string rwyClass = getRunwayClassFromTrafficType(fltType);
-
-  // Only set this if it hasn't been set by ATC already.
-  if (activeRunway.empty()) {
-      //cerr << "Getting runway for " << ac->getTrafficRef()->getCallSign() << " at " << apt->getId() << endl;
-      double depHeading = ac->getTrafficRef()->getCourse();
-      apt->getDynamics()->getActiveRunway(rwyClass, 1, activeRunway, depHeading);
-  }
-  rwy = apt->getRunwayByIdent(activeRunway);
-  SGGeod runwayTakeoff = rwy->pointOnCenterline(5.0);
-
-  FGGroundNetwork* gn = apt->getDynamics()->getGroundNetwork();
-  if (!gn->exists()) {
-    createDefaultTakeoffTaxi(ac, apt, rwy);
-    return;
-  }
-  
-  intVec ids;
-  int runwayId = gn->findNearestNode(runwayTakeoff);
-
-  // A negative gateId indicates an overflow parking, use a
-  // fallback mechanism for this. 
-  // Starting from gate 0 in this case is a bit of a hack
-  // which requires a more proper solution later on.
-  delete taxiRoute;
-  taxiRoute = new FGTaxiRoute;
-
-  // Determine which node to start from.
-  int node = 0;
-  // Find out which node to start from
-  FGParking *park = apt->getDynamics()->getParking(gateId);
-  if (park) {
-    node = park->getPushBackPoint();
-  }
-  
-  if (node == -1) {
-    node = gateId;
-  }
-  
-  // HAndle case where parking doens't have a node
-  if ((node == 0) && park) {
+
+    string rwyClass = getRunwayClassFromTrafficType(fltType);
+
+    // Only set this if it hasn't been set by ATC already.
+    if (activeRunway.empty()) {
+        //cerr << "Getting runway for " << ac->getTrafficRef()->getCallSign() << " at " << apt->getId() << endl;
+        double depHeading = ac->getTrafficRef()->getCourse();
+        apt->getDynamics()->getActiveRunway(rwyClass, 1, activeRunway,
+                                            depHeading);
+    }
+    FGRunway * rwy = apt->getRunwayByIdent(activeRunway);
+    assert( rwy != NULL );
+    SGGeod runwayTakeoff = rwy->pointOnCenterline(5.0);
+
+    FGGroundNetwork *gn = apt->getDynamics()->getGroundNetwork();
+    if (!gn->exists()) {
+        createDefaultTakeoffTaxi(ac, apt, rwy);
+        return true;
+    }
+
+    intVec ids;
+    int runwayId = 0;
+    if (gn->getVersion() > 0) {
+        runwayId = gn->findNearestNodeOnRunway(runwayTakeoff);
+    } else {
+        runwayId = gn->findNearestNode(runwayTakeoff);
+    }
+
+    // A negative gateId indicates an overflow parking, use a
+    // fallback mechanism for this. 
+    // Starting from gate 0 in this case is a bit of a hack
+    // which requires a more proper solution later on.
+    delete taxiRoute;
+    taxiRoute = new FGTaxiRoute;
+
+    // Determine which node to start from.
+    int node = 0;
+    // Find out which node to start from
+    FGParking *park = apt->getDynamics()->getParking(gateId);
+    if (park) {
+        node = park->getPushBackPoint();
+    }
+
+    if (node == -1) {
+        node = gateId;
+    }
+    // HAndle case where parking doens't have a node
+    if ((node == 0) && park) {
+        if (firstFlight) {
+            node = gateId;
+        } else {
+            node = lastNodeVisited;
+        }
+    }
+
+    *taxiRoute = gn->findShortestRoute(node, runwayId);
+    intVecIterator i;
+
+    if (taxiRoute->empty()) {
+        createDefaultTakeoffTaxi(ac, apt, rwy);
+        return true;
+    }
+
+    taxiRoute->first();
+    //bool isPushBackPoint = false;
     if (firstFlight) {
-      node = gateId;
+        // If this is called during initialization, randomly
+        // skip a number of waypoints to get a more realistic
+        // taxi situation.
+        int nrWaypointsToSkip = rand() % taxiRoute->size();
+        // but make sure we always keep two active waypoints
+        // to prevent a segmentation fault
+        for (int i = 0; i < nrWaypointsToSkip - 3; i++) {
+            taxiRoute->next(&node);
+        }
+        apt->getDynamics()->releaseParking(gateId);
     } else {
-      node = lastNodeVisited;
+        if (taxiRoute->size() > 1) {
+            taxiRoute->next(&node);     // chop off the first waypoint, because that is already the last of the pushback route
+        }
     }
-  }
 
-  *taxiRoute = gn->findShortestRoute(node, runwayId);
-  intVecIterator i;
-        
-  if (taxiRoute->empty()) {
-    createDefaultTakeoffTaxi(ac, apt, rwy);
-    return;
-  }
-  
-  taxiRoute->first();
-  //bool isPushBackPoint = false;
-  if (firstFlight) {
-    // If this is called during initialization, randomly
-    // skip a number of waypoints to get a more realistic
-    // taxi situation.
-    int nrWaypointsToSkip = rand() % taxiRoute->size();
-    // but make sure we always keep two active waypoints
-    // to prevent a segmentation fault
-    for (int i = 0; i < nrWaypointsToSkip-2; i++) {
-      taxiRoute->next(&node);
-    }
-    apt->getDynamics()->releaseParking(gateId);
-  } else {
-    if (taxiRoute->size() > 1) {
-      taxiRoute->next(&node); // chop off the first waypoint, because that is already the last of the pushback route
-    }
-  }
-  
-  // push each node on the taxi route as a waypoint
-  int route;
-  while(taxiRoute->next(&node, &route)) {
-               char buffer[10];
-               snprintf (buffer, 10, "%d", node);
-               FGTaxiNode *tn = apt->getDynamics()->getGroundNetwork()->findNode(node);
-    waypoint* wpt = createOnGround(ac, buffer, tn->geod(), apt->getElevation(), 15);
-    wpt->routeIndex = route;
-               waypoints.push_back(wpt);
-  }
+    // push each node on the taxi route as a waypoint
+    int route;
+    //cerr << "Building taxi route" << endl;
+    while (taxiRoute->next(&node, &route)) {
+        char buffer[10];
+        snprintf(buffer, 10, "%d", node);
+        FGTaxiNode *tn =
+            apt->getDynamics()->getGroundNetwork()->findNode(node);
+        FGAIWaypoint *wpt =
+            createOnGround(ac, buffer, tn->geod(), apt->getElevation(),
+                           ac->getPerformance()->vTaxi());
+        wpt->setRouteIndex(route);
+        //cerr << "Nodes left " << taxiRoute->nodesLeft() << " ";
+        if (taxiRoute->nodesLeft() == 1) {
+            // Note that we actually have hold points in the ground network, but this is just an initial test.
+            //cerr << "Setting departurehold point: " << endl;
+            wpt->setName( wpt->getName() + string("DepartureHold"));
+        }
+        if (taxiRoute->nodesLeft() == 0) {
+            wpt->setName(wpt->getName() + string("Accel"));
+        }
+        pushBackWaypoint(wpt);
+    }
+    // Acceleration point, 105 meters into the runway,
+    SGGeod accelPoint = rwy->pointOnCenterline(105.0);
+    FGAIWaypoint *wpt = createOnGround(ac, "accel", accelPoint, apt->getElevation(), ac->getPerformance()->vRotate());
+    pushBackWaypoint(wpt);
+
+    //cerr << "[done]" << endl;
+    return true;
 }
 
-void FGAIFlightPlan::createDefaultLandingTaxi(FGAIAircraft *ac, FGAirport* aAirport)
+void FGAIFlightPlan::createDefaultLandingTaxi(FGAIAircraft * ac,
+                                              FGAirport * aAirport)
 {
-  SGGeod lastWptPos = 
-    SGGeod::fromDeg(waypoints.back()->longitude, waypoints.back()->latitude);
-  double airportElev = aAirport->getElevation();
-  
-  waypoint* wpt;
-  wpt = createOnGround(ac, "Runway Exit", lastWptPos, airportElev, 15);
-  waypoints.push_back(wpt);    
-  wpt = createOnGround(ac, "Airport Center", aAirport->geod(), airportElev, 15);
-  waypoints.push_back(wpt);
-  
-  double heading, lat, lon;
-  aAirport->getDynamics()->getParking(gateId, &lat, &lon, &heading);
-  wpt = createOnGround(ac, "END", SGGeod::fromDeg(lon, lat), airportElev, 15);
-  waypoints.push_back(wpt);
+    SGGeod lastWptPos =
+        SGGeod::fromDeg(waypoints.back()->getLongitude(),
+                        waypoints.back()->getLatitude());
+    double airportElev = aAirport->getElevation();
+
+    FGAIWaypoint *wpt;
+    wpt =
+        createOnGround(ac, "Runway Exit", lastWptPos, airportElev,
+                       ac->getPerformance()->vTaxi());
+    pushBackWaypoint(wpt);
+    wpt =
+        createOnGround(ac, "Airport Center", aAirport->geod(), airportElev,
+                       ac->getPerformance()->vTaxi());
+    pushBackWaypoint(wpt);
+
+    FGParking* parkPos = aAirport->getDynamics()->getParking(gateId);
+    if (parkPos) {
+        wpt = createOnGround(ac, "ENDtaxi", parkPos->geod(), airportElev,
+                         ac->getPerformance()->vTaxi());
+        pushBackWaypoint(wpt);
+    }
 }
 
-void FGAIFlightPlan::createLandingTaxi(FGAIAircraft *ac, FGAirport *apt,
-                               double radius, const string& fltType, 
-                               const string& acType, const string& airline)
+bool FGAIFlightPlan::createLandingTaxi(FGAIAircraft * ac, FGAirport * apt,
+                                       double radius,
+                                       const string & fltType,
+                                       const string & acType,
+                                       const string & airline)
 {
-  double heading, lat, lon;
-  apt->getDynamics()->getAvailableParking(&lat, &lon, &heading, 
-        &gateId, radius, fltType, acType, airline);
-  
-  SGGeod lastWptPos = 
-    SGGeod::fromDeg(waypoints.back()->longitude, waypoints.back()->latitude);
-  FGGroundNetwork* gn = apt->getDynamics()->getGroundNetwork();
-  
-   // Find a route from runway end to parking/gate.
-  if (!gn->exists()) {
-    createDefaultLandingTaxi(ac, apt);
-    return;
-  }
-  
-       intVec ids;
-  int runwayId = gn->findNearestNode(lastWptPos);
-  // A negative gateId indicates an overflow parking, use a
-  // fallback mechanism for this. 
-  // Starting from gate 0 is a bit of a hack...
-  //FGTaxiRoute route;
-  delete taxiRoute;
-  taxiRoute = new FGTaxiRoute;
-  if (gateId >= 0)
-    *taxiRoute = gn->findShortestRoute(runwayId, gateId);
-  else
-    *taxiRoute = gn->findShortestRoute(runwayId, 0);
-  intVecIterator i;
-  
-  if (taxiRoute->empty()) {
-    createDefaultLandingTaxi(ac, apt);
-    return;
-  }
-  
-  int node;
-  taxiRoute->first();
-  int size = taxiRoute->size();
-  // Omit the last two waypoints, as 
-  // those are created by createParking()
-  int route;
-  for (int i = 0; i < size-2; i++) {
-    taxiRoute->next(&node, &route);
-    char buffer[10];
-    snprintf (buffer, 10, "%d", node);
-    FGTaxiNode *tn = gn->findNode(node);
-    waypoint* wpt = createOnGround(ac, buffer, tn->geod(), apt->getElevation(), 15);
-    wpt->routeIndex = route;
-    waypoints.push_back(wpt);
-  }
+    gateId = apt->getDynamics()->getAvailableParking(radius, fltType,
+                                            acType, airline);
+
+    SGGeod lastWptPos =
+        SGGeod::fromDeg(waypoints.back()->getLongitude(),
+                        waypoints.back()->getLatitude());
+    FGGroundNetwork *gn = apt->getDynamics()->getGroundNetwork();
+
+    // Find a route from runway end to parking/gate.
+    if (!gn->exists()) {
+        createDefaultLandingTaxi(ac, apt);
+        return true;
+    }
+
+    intVec ids;
+    int runwayId = 0;
+    if (gn->getVersion() == 1) {
+        runwayId = gn->findNearestNodeOnRunway(lastWptPos);
+    } else {
+        runwayId = gn->findNearestNode(lastWptPos);
+    }
+    //cerr << "Using network node " << runwayId << endl;
+    // A negative gateId indicates an overflow parking, use a
+    // fallback mechanism for this. 
+    // Starting from gate 0 is a bit of a hack...
+    //FGTaxiRoute route;
+    delete taxiRoute;
+    taxiRoute = new FGTaxiRoute;
+    if (gateId >= 0)
+        *taxiRoute = gn->findShortestRoute(runwayId, gateId);
+    else
+        *taxiRoute = gn->findShortestRoute(runwayId, 0);
+    intVecIterator i;
+
+    if (taxiRoute->empty()) {
+        createDefaultLandingTaxi(ac, apt);
+        return true;
+    }
+
+    int node;
+    taxiRoute->first();
+    int size = taxiRoute->size();
+    // Omit the last two waypoints, as 
+    // those are created by createParking()
+    int route;
+    for (int i = 0; i < size - 2; i++) {
+        taxiRoute->next(&node, &route);
+        char buffer[10];
+        snprintf(buffer, 10, "%d", node);
+        FGTaxiNode *tn = gn->findNode(node);
+        FGAIWaypoint *wpt =
+            createOnGround(ac, buffer, tn->geod(), apt->getElevation(),
+                           ac->getPerformance()->vTaxi());
+        wpt->setRouteIndex(route);
+        pushBackWaypoint(wpt);
+    }
+    return true;
 }
 
 /*******************************************************************
  * CreateTakeOff 
- * initialize the Aircraft at the parking location
+ * A note on units: 
+ *  - Speed -> knots -> nm/hour
+ *  - distance along runway =-> meters 
+ *  - accel / decel -> is given as knots/hour, but this is highly questionable:
+ *  for a jet_transport performance class, a accel / decel rate of 5 / 2 is 
+ *  given respectively. According to performance data.cxx, a value of kts / second seems
+ *  more likely however. 
+ * 
  ******************************************************************/
-void FGAIFlightPlan::createTakeOff(FGAIAircraft *ac, bool firstFlight, FGAirport *apt, double speed, const string &fltType)
+bool FGAIFlightPlan::createTakeOff(FGAIAircraft * ac, bool firstFlight,
+                                   FGAirport * apt, double speed,
+                                   const string & fltType)
 {
-    double accel   = ac->getPerformance()->acceleration();
+    double accel = ac->getPerformance()->acceleration();
+    double vTaxi = ac->getPerformance()->vTaxi();
     double vRotate = ac->getPerformance()->vRotate();
+    double vTakeoff = ac->getPerformance()->vTakeoff();
+    //double vClimb = ac->getPerformance()->vClimb();
+
+    double accelMetric = (accel * SG_NM_TO_METER) / 3600;
+    double vTaxiMetric = (vTaxi * SG_NM_TO_METER) / 3600;
+    double vRotateMetric = (vRotate * SG_NM_TO_METER) / 3600;
+    double vTakeoffMetric = (vTakeoff * SG_NM_TO_METER) / 3600;
+    //double vClimbMetric = (vClimb * SG_NM_TO_METER) / 3600;
     // Acceleration = dV / dT
     // Acceleration X dT = dV
     // dT = dT / Acceleration
     //d = (Vf^2 - Vo^2) / (2*a)
-    double accelTime = (vRotate - 15) / accel;
+    //double accelTime = (vRotate - vTaxi) / accel;
     //cerr << "Using " << accelTime << " as total acceleration time" << endl;
-    double accelDistance = (vRotate*vRotate - 15*15) / (2*accel);
-    //cerr << "Using " << accelDistance << " " << accel << " " << vRotate << endl;
-    waypoint *wpt;
+    double accelDistance =
+        (vRotateMetric * vRotateMetric -
+         vTaxiMetric * vTaxiMetric) / (2 * accelMetric);
+    //cerr << "Using " << accelDistance << " " << accelMetric << " " << vRotateMetric << endl;
+    FGAIWaypoint *wpt;
     // Get the current active runway, based on code from David Luff
     // This should actually be unified and extended to include 
     // Preferential runway use schema's 
     // NOTE: DT (2009-01-18: IIRC, this is currently already the case, 
     // because the getActive runway function takes care of that.
-    if (firstFlight)
-    {
+    if (firstFlight) {
         string rwyClass = getRunwayClassFromTrafficType(fltType);
         double heading = ac->getTrafficRef()->getCourse();
-        apt->getDynamics()->getActiveRunway(rwyClass, 1, activeRunway, heading);
-        rwy = apt->getRunwayByIdent(activeRunway);
+        apt->getDynamics()->getActiveRunway(rwyClass, 1, activeRunway,
+                                            heading);
     }
+    FGRunway * rwy = apt->getRunwayByIdent(activeRunway);
+    assert( rwy != NULL );
 
     double airportElev = apt->getElevation();
-    // Acceleration point, 105 meters into the runway,
-    SGGeod accelPoint = rwy->pointOnCenterline(105.0);
-    wpt = createOnGround(ac, "accel", accelPoint, airportElev, speed);
-    waypoints.push_back(wpt); 
-    //Start Climbing to 3000 ft. Let's do this 
-    // at the center of the runway for now:
-    SGGeod rotate = rwy->pointOnCenterline(105.0+accelDistance);
-    wpt = cloneWithPos(ac, wpt, "SOC", rotate);
-    wpt->altitude  = airportElev+1000;
-    wpt->on_ground = false;
-    waypoints.push_back(wpt);
+    
+
+    accelDistance =
+        (vTakeoffMetric * vTakeoffMetric -
+         vTaxiMetric * vTaxiMetric) / (2 * accelMetric);
+    //cerr << "Using " << accelDistance << " " << accelMetric << " " << vTakeoffMetric << endl;
+    SGGeod accelPoint = rwy->pointOnCenterline(105.0 + accelDistance);
+    wpt = createOnGround(ac, "rotate", accelPoint, airportElev, vTakeoff);
+    pushBackWaypoint(wpt);
+
+    accelDistance =
+        ((vTakeoffMetric * 1.1) * (vTakeoffMetric * 1.1) -
+         vTaxiMetric * vTaxiMetric) / (2 * accelMetric);
+    //cerr << "Using " << accelDistance << " " << accelMetric << " " << vTakeoffMetric << endl;
+    accelPoint = rwy->pointOnCenterline(105.0 + accelDistance);
+    wpt =
+        createOnGround(ac, "rotate", accelPoint, airportElev + 1000,
+                       vTakeoff * 1.1);
+    wpt->setOn_ground(false);
+    pushBackWaypoint(wpt);
 
     wpt = cloneWithPos(ac, wpt, "3000 ft", rwy->end());
-    wpt->altitude  = airportElev+3000;
-    waypoints.push_back(wpt);
+    wpt->setAltitude(airportElev + 3000);
+    pushBackWaypoint(wpt);
 
     // Finally, add two more waypoints, so that aircraft will remain under
     // Tower control until they have reached the 3000 ft climb point
     SGGeod pt = rwy->pointOnCenterline(5000 + rwy->lengthM() * 0.5);
     wpt = cloneWithPos(ac, wpt, "5000 ft", pt);
-    wpt->altitude  = airportElev+5000;
-    waypoints.push_back(wpt);
+    wpt->setAltitude(airportElev + 5000);
+    pushBackWaypoint(wpt);
+    return true;
 }
-  
+
 /*******************************************************************
  * CreateClimb
  * initialize the Aircraft at the parking location
  ******************************************************************/
-void FGAIFlightPlan::createClimb(FGAIAircraft *ac, bool firstFlight, FGAirport *apt, double speed, double alt, const string &fltType)
+bool FGAIFlightPlan::createClimb(FGAIAircraft * ac, bool firstFlight,
+                                 FGAirport * apt, double speed, double alt,
+                                 const string & fltType)
 {
-  waypoint *wpt;
-  bool planLoaded = false;
-  string fPLName;
+    FGAIWaypoint *wpt;
+//  bool planLoaded = false;
+    string fPLName;
+    double vClimb = ac->getPerformance()->vClimb();
 
-  if (firstFlight) {
-    string rwyClass = getRunwayClassFromTrafficType(fltType);
-    double heading = ac->getTrafficRef()->getCourse();
-    apt->getDynamics()->getActiveRunway(rwyClass, 1, activeRunway, heading);
-    rwy = apt->getRunwayByIdent(activeRunway);
-  }
-  if (sid) {
-    for (wpt_vector_iterator i = sid->getFirstWayPoint(); 
-         i != sid->getLastWayPoint(); 
-         i++) {
-            waypoints.push_back(clone(*(i)));
+    if (firstFlight) {
+        string rwyClass = getRunwayClassFromTrafficType(fltType);
+        double heading = ac->getTrafficRef()->getCourse();
+        apt->getDynamics()->getActiveRunway(rwyClass, 1, activeRunway,
+                                            heading);
+    }
+    if (sid) {
+        for (wpt_vector_iterator i = sid->getFirstWayPoint();
+             i != sid->getLastWayPoint(); i++) {
+            pushBackWaypoint(clone(*(i)));
             //cerr << " Cloning waypoint " << endl;
+        }
+    } else {
+        FGRunway * rwy = apt->getRunwayByIdent(activeRunway);
+        assert( rwy != NULL );
+
+        SGGeod climb1 = rwy->pointOnCenterline(10 * SG_NM_TO_METER);
+        wpt = createInAir(ac, "10000ft climb", climb1, 10000, vClimb);
+        wpt->setGear_down(true);
+        wpt->setFlaps_down(true);
+        pushBackWaypoint(wpt);
+
+        SGGeod climb2 = rwy->pointOnCenterline(20 * SG_NM_TO_METER);
+        wpt = cloneWithPos(ac, wpt, "18000ft climb", climb2);
+        wpt->setAltitude(18000);
+        pushBackWaypoint(wpt);
     }
-  } else  {
-      SGGeod climb1 = rwy->pointOnCenterline(10*SG_NM_TO_METER);
-      wpt = createInAir(ac, "10000ft climb", climb1, speed, 10000);
-      wpt->gear_down = true;
-      wpt->flaps_down= true;
-      waypoints.push_back(wpt); 
-
-      SGGeod climb2 = rwy->pointOnCenterline(20*SG_NM_TO_METER);
-      wpt = cloneWithPos(ac, wpt, "18000ft climb", climb2);
-      wpt->altitude  = 18000;
-      waypoints.push_back(wpt); 
-   }
+    return true;
 }
 
 
 
 /*******************************************************************
- * CreateDecent
- * initialize the Aircraft at the parking location
+ * CreateDescent
+ * Generate a flight path from the last waypoint of the cruise to 
+ * the permission to land point
  ******************************************************************/
-void FGAIFlightPlan::createDecent(FGAIAircraft *ac, FGAirport *apt, const string &fltType)
+bool FGAIFlightPlan::createDescent(FGAIAircraft * ac, FGAirport * apt,
+                                   double latitude, double longitude,
+                                   double speed, double alt,
+                                   const string & fltType,
+                                   double requiredDistance)
 {
-  // Ten thousand ft. Slowing down to 240 kts
-  waypoint *wpt;
-
-  //Beginning of Decent
-  //string name;
-  // allow "mil" and "gen" as well
-  string rwyClass = getRunwayClassFromTrafficType(fltType);
-  double heading = ac->getTrafficRef()->getCourse();
-  apt->getDynamics()->getActiveRunway(rwyClass, 2, activeRunway, heading);
-  rwy = apt->getRunwayByIdent(activeRunway);
-     
-  SGGeod descent1 = rwy->pointOnCenterline(-100000); // 100km out
-  wpt = createInAir(ac, "Dec 10000ft", descent1, apt->getElevation(), 240);
-  wpt->crossat   = 10000;
-  waypoints.push_back(wpt);  
-  
-  // Three thousand ft. Slowing down to 160 kts
-  SGGeod descent2 = rwy->pointOnCenterline(-8*SG_NM_TO_METER); // 8nm out
-  wpt = createInAir(ac, "DEC 3000ft", descent2, apt->getElevation(), 160);
-  wpt->crossat   = 3000;
-  wpt->gear_down = true;
-  wpt->flaps_down= true;
-  waypoints.push_back(wpt);
+    bool reposition = false;
+    FGAIWaypoint *wpt;
+    double vDescent = ac->getPerformance()->vDescent();
+    double vApproach = ac->getPerformance()->vApproach();
+    double vTouchdown = ac->getPerformance()->vTouchdown();
+
+
+    //Beginning of Descent 
+    string rwyClass = getRunwayClassFromTrafficType(fltType);
+    double heading = ac->getTrafficRef()->getCourse();
+    apt->getDynamics()->getActiveRunway(rwyClass, 2, activeRunway,
+                                        heading);
+    FGRunway * rwy = apt->getRunwayByIdent(activeRunway);
+    assert( rwy != NULL );
+
+    // Create a slow descent path that ends 250 lateral to the runway.
+    double initialTurnRadius = getTurnRadius(vDescent, true);
+    //double finalTurnRadius = getTurnRadius(vApproach, true);
+
+// get length of the downwind leg for the intended runway
+    double distanceOut = apt->getDynamics()->getApproachController()->getRunway(rwy->name())->getApproachDistance();    //12 * SG_NM_TO_METER;
+    //time_t previousArrivalTime=  apt->getDynamics()->getApproachController()->getRunway(rwy->name())->getEstApproachTime();
+
+
+    SGGeod current = SGGeod::fromDegM(longitude, latitude, 0);
+    SGGeod initialTarget = rwy->pointOnCenterline(-distanceOut);
+    SGGeod refPoint = rwy->pointOnCenterline(0);
+    double distance = SGGeodesy::distanceM(current, initialTarget);
+    double azimuth = SGGeodesy::courseDeg(current, initialTarget);
+    double dummyAz2;
+
+    // To prevent absurdly steep approaches, compute the origin from where the approach should have started
+    SGGeod origin;
+
+    if (ac->getTrafficRef()->getCallSign() ==
+        fgGetString("/ai/track-callsign")) {
+        //cerr << "Reposition information: Actual distance " << distance << ". required distance " << requiredDistance << endl;
+        //exit(1);
+    }
+
+    if (distance < requiredDistance * 0.8) {
+        reposition = true;
+        SGGeodesy::direct(initialTarget, azimuth,
+                          -requiredDistance, origin, dummyAz2);
+
+        distance = SGGeodesy::distanceM(current, initialTarget);
+        azimuth = SGGeodesy::courseDeg(current, initialTarget);
+    } else {
+        origin = current;
+    }
+
+
+    double dAlt = 0; //  = alt - (apt->getElevation() + 2000);
+    FGTaxiNode * tn = 0;
+    if (apt->getDynamics()->getGroundNetwork()) {
+        int node = apt->getDynamics()->getGroundNetwork()->findNearestNode(refPoint);
+        tn = apt->getDynamics()->getGroundNetwork()->findNode(node);
+    }
+    if (tn) {
+        dAlt = alt - ((tn->getElevationFt(apt->getElevation())) + 2000);
+    } else {
+        dAlt = alt - (apt->getElevation() + 2000);
+    }
+
+    double nPoints = 100;
+
+    char buffer[16];
+
+    // The descent path contains the following phases:
+    // 1) a linear glide path from the initial position to
+    // 2) a semi circle turn to final
+    // 3) approach
+
+    //cerr << "Phase 1: Linear Descent path to runway" << rwy->name() << endl;
+    // Create an initial destination point on a semicircle
+    //cerr << "lateral offset : " << lateralOffset << endl;
+    //cerr << "Distance       : " << distance      << endl;
+    //cerr << "Azimuth        : " << azimuth       << endl;
+    //cerr << "Initial Lateral point: " << lateralOffset << endl;
+//    double lat = refPoint.getLatitudeDeg();
+//    double lon = refPoint.getLongitudeDeg();
+    //cerr << "Reference point (" << lat << ", " << lon << ")." << endl;
+//    lat = initialTarget.getLatitudeDeg();
+//    lon = initialTarget.getLongitudeDeg();
+    //cerr << "Initial Target point (" << lat << ", " << lon << ")." << endl;
+
+    double ratio = initialTurnRadius / distance;
+    if (ratio > 1.0)
+        ratio = 1.0;
+    if (ratio < -1.0)
+        ratio = -1.0;
+
+    double newHeading = asin(ratio) * SG_RADIANS_TO_DEGREES;
+    double newDistance =
+        cos(newHeading * SG_DEGREES_TO_RADIANS) * distance;
+    //cerr << "new distance " << newDistance << ". additional Heading " << newHeading << endl;
+    double side = azimuth - rwy->headingDeg();
+    double lateralOffset = initialTurnRadius;
+    if (side < 0)
+        side += 360;
+    if (side < 180) {
+        lateralOffset *= -1;
+    }
+    // Calculate the ETA at final, based on remaining distance, and approach speed.
+    // distance should really consist of flying time to terniary target, plus circle 
+    // but the distance to secondary target should work as a reasonable approximation
+    // aditionally add the amount of distance covered by making a turn of "side"
+    double turnDistance = (2 * M_PI * initialTurnRadius) * (side / 360.0);
+    time_t remaining =
+        (turnDistance + distance) / ((vDescent * SG_NM_TO_METER) / 3600.0);
+    time_t now = time(NULL) + fgGetLong("/sim/time/warp");
+    //if (ac->getTrafficRef()->getCallSign() == fgGetString("/ai/track-callsign")) {
+    //     cerr << "   Arrival time estimation: turn angle " <<  side << ". Turn distance " << turnDistance << ". Linear distance " << distance << ". Time to go " << remaining << endl;
+    //     //exit(1);
+    //}
+
+    time_t eta = now + remaining;
+    //choose a distance to the runway such that it will take at least 60 seconds more
+    // time to get there than the previous aircraft.
+    // Don't bother when aircraft need to be repositioned, because that marks the initialization phased...
+
+    time_t newEta;
+
+    if (reposition == false) {
+        newEta =
+            apt->getDynamics()->getApproachController()->getRunway(rwy->
+                                                                   name
+                                                                   ())->
+            requestTimeSlot(eta);
+    } else {
+        newEta = eta;
+    }
+    //if ((eta < (previousArrivalTime+60)) && (reposition == false)) {
+    arrivalTime = newEta;
+    time_t additionalTimeNeeded = newEta - eta;
+    double distanceCovered =
+        ((vApproach * SG_NM_TO_METER) / 3600.0) * additionalTimeNeeded;
+    distanceOut += distanceCovered;
+    //apt->getDynamics()->getApproachController()->getRunway(rwy->name())->setEstApproachTime(eta+additionalTimeNeeded);
+    //cerr << "Adding additional distance: " << distanceCovered << " to allow " << additionalTimeNeeded << " seconds of flying time" << endl << endl;
+    //} else {
+    //apt->getDynamics()->getApproachController()->getRunway(rwy->name())->setEstApproachTime(eta);
+    //}
+    //cerr << "Timing information : Previous eta: " << previousArrivalTime << ". Current ETA : " << eta << endl;
+
+    SGGeod secondaryTarget =
+        rwy->pointOffCenterline(-distanceOut, lateralOffset);
+    initialTarget = rwy->pointOnCenterline(-distanceOut);
+    distance = SGGeodesy::distanceM(origin, secondaryTarget);
+    azimuth = SGGeodesy::courseDeg(origin, secondaryTarget);
+
+
+//    lat = secondaryTarget.getLatitudeDeg();
+//    lon = secondaryTarget.getLongitudeDeg();
+    //cerr << "Secondary Target point (" << lat << ", " << lon << ")." << endl;
+    //cerr << "Distance       : " << distance      << endl;
+    //cerr << "Azimuth        : " << azimuth       << endl;
+
+
+    ratio = initialTurnRadius / distance;
+    if (ratio > 1.0)
+        ratio = 1.0;
+    if (ratio < -1.0)
+        ratio = -1.0;
+    newHeading = asin(ratio) * SG_RADIANS_TO_DEGREES;
+    newDistance = cos(newHeading * SG_DEGREES_TO_RADIANS) * distance;
+    //cerr << "new distance realative to secondary target: " << newDistance << ". additional Heading " << newHeading << endl;
+    if (side < 180) {
+        azimuth += newHeading;
+    } else {
+        azimuth -= newHeading;
+    }
+
+    SGGeod tertiaryTarget;
+    SGGeodesy::direct(origin, azimuth,
+                      newDistance, tertiaryTarget, dummyAz2);
+
+//    lat = tertiaryTarget.getLatitudeDeg();
+//    lon = tertiaryTarget.getLongitudeDeg();
+    //cerr << "tertiary Target point (" << lat << ", " << lon << ")." << endl;
+
+
+    for (int i = 1; i < nPoints; i++) {
+        SGGeod result;
+        double currentDist = i * (newDistance / nPoints);
+        double currentAltitude = alt - (i * (dAlt / nPoints));
+        SGGeodesy::direct(origin, azimuth, currentDist, result, dummyAz2);
+        snprintf(buffer, 16, "descent%03d", i);
+        wpt = createInAir(ac, buffer, result, currentAltitude, vDescent);
+        wpt->setCrossat(currentAltitude);
+        wpt->setTrackLength((newDistance / nPoints));
+        pushBackWaypoint(wpt);
+        //cerr << "Track Length : " << wpt->trackLength;
+        //cerr << "  Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << endl;
+    }
+
+    //cerr << "Phase 2: Circle " << endl;
+    double initialAzimuth =
+        SGGeodesy::courseDeg(secondaryTarget, tertiaryTarget);
+    double finalAzimuth =
+        SGGeodesy::courseDeg(secondaryTarget, initialTarget);
+
+    //cerr << "Angles from secondary target: " << initialAzimuth << " " << finalAzimuth << endl;
+    int increment, startval, endval;
+    // circle right around secondary target if orig of position is to the right of the runway
+    // i.e. use negative angles; else circle leftward and use postivi
+    if (side < 180) {
+        increment = -1;
+        startval = floor(initialAzimuth);
+        endval = ceil(finalAzimuth);
+        if (endval > startval) {
+            endval -= 360;
+        }
+    } else {
+        increment = 1;
+        startval = ceil(initialAzimuth);
+        endval = floor(finalAzimuth);
+        if (endval < startval) {
+            endval += 360;
+        }
+
+    }
+
+    //cerr << "creating circle between " << startval << " and " << endval << " using " << increment << endl;
+    //FGTaxiNode * tn = apt->getDynamics()->getGroundNetwork()->findNearestNode(initialTarget);
+    double currentAltitude = 0;
+    if (tn) {
+        currentAltitude = (tn->getElevationFt(apt->getElevation())) + 2000;
+    } else {
+        currentAltitude = apt->getElevation() + 2000;
+    }
+        
+    double trackLength = (2 * M_PI * initialTurnRadius) / 360.0;
+    for (int i = startval; i != endval; i += increment) {
+        SGGeod result;
+        //double currentAltitude = apt->getElevation() + 2000;
+        
+        SGGeodesy::direct(secondaryTarget, i,
+                          initialTurnRadius, result, dummyAz2);
+        snprintf(buffer, 16, "turn%03d", i);
+        wpt = createInAir(ac, buffer, result, currentAltitude, vDescent);
+        wpt->setCrossat(currentAltitude);
+        wpt->setTrackLength(trackLength);
+        //cerr << "Track Length : " << wpt->trackLength;
+        pushBackWaypoint(wpt);
+        //cerr << "  Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << endl;
+    }
+
+
+    // The approach leg should bring the aircraft to approximately 4-6 nm out, after which the landing phase should take over. 
+    //cerr << "Phase 3: Approach" << endl;
+    double tgt_speed = vApproach;
+    distanceOut -= distanceCovered;
+    double touchDownPoint = 0; //(rwy->lengthM() * 0.1);
+    for (int i = 1; i < nPoints; i++) {
+        SGGeod result;
+        double currentDist = i * (distanceOut / nPoints);
+        //double currentAltitude =
+        //    apt->getElevation() + 2000 - (i * 2000 / (nPoints-1));
+        double alt = currentAltitude -  (i * 2000 / (nPoints - 1));
+        snprintf(buffer, 16, "final%03d", i);
+        result = rwy->pointOnCenterline((-distanceOut) + currentDist + touchDownPoint);
+        if (i == nPoints - 30) {
+            tgt_speed = vTouchdown;
+        }
+        wpt = createInAir(ac, buffer, result, alt, tgt_speed);
+        wpt->setCrossat(alt);
+        wpt->setTrackLength((distanceOut / nPoints));
+        // account for the extra distance due to an extended downwind leg
+        if (i == 1) {
+            wpt->setTrackLength(wpt->getTrackLength() + distanceCovered);
+        }
+        //cerr << "Track Length : " << wpt->trackLength;
+        pushBackWaypoint(wpt);
+        //if (apt->ident() == fgGetString("/sim/presets/airport-id")) {
+        //    cerr << "  Position : " << result.getLatitudeDeg() << " " << result.getLongitudeDeg() << " " << currentAltitude << " " << apt->getElevation() << " " << distanceOut << endl;
+        //}
+    }
+
+    //cerr << "Done" << endl;
+
+    // Erase the two bogus BOD points: Note check for conflicts with scripted AI flightPlans
+    IncrementWaypoint(true);
+    IncrementWaypoint(true);
+
+    if (reposition) {
+        double tempDistance;
+        //double minDistance = HUGE_VAL;
+        string wptName;
+        tempDistance = SGGeodesy::distanceM(current, initialTarget);
+        time_t eta =
+            tempDistance / ((vDescent * SG_NM_TO_METER) / 3600.0) + now;
+        time_t newEta =
+            apt->getDynamics()->getApproachController()->getRunway(rwy->
+                                                                   name
+                                                                   ())->
+            requestTimeSlot(eta);
+        arrivalTime = newEta;
+        double newDistance =
+            ((vDescent * SG_NM_TO_METER) / 3600.0) * (newEta - now);
+        //cerr << "Repositioning information : eta" << eta << ". New ETA " << newEta << ". Diff = " << (newEta - eta) << ". Distance = " << tempDistance << ". New distance = " << newDistance << endl;
+        IncrementWaypoint(true);        // remove waypoint BOD2
+        while (checkTrackLength("final001") > newDistance) {
+            IncrementWaypoint(true);
+        }
+        //cerr << "Repositioning to waypoint " << (*waypoints.begin())->name << endl;
+        ac->resetPositionFromFlightPlan();
+    }
+    waypoints[1]->setName( (waypoints[1]->getName() + string("legend"))); 
+    waypoints.back()->setName(waypoints.back()->getName() + "LandingThreshold");
+    return true;
 }
+
 /*******************************************************************
  * CreateLanding
- * initialize the Aircraft at the parking location
+ * Create a flight path from the "permision to land" point (currently
+   hardcoded at 5000 meters from the threshold) to the threshold, at
+   a standard glide slope angle of 3 degrees. 
+   Position : 50.0354 8.52592 384 364 11112
  ******************************************************************/
-void FGAIFlightPlan::createLanding(FGAIAircraft *ac, FGAirport *apt)
+bool FGAIFlightPlan::createLanding(FGAIAircraft * ac, FGAirport * apt,
+                                   const string & fltType)
 {
-  // Ten thousand ft. Slowing down to 150 kts
-  waypoint *wpt;
-  double aptElev = apt->getElevation();
-  //Runway Threshold
-  wpt = createOnGround(ac, "Threshold", rwy->threshold(), aptElev, 150);
-  wpt->crossat = apt->getElevation();
-  waypoints.push_back(wpt); 
-
- // Roll-out
-  wpt = createOnGround(ac, "Center", rwy->geod(), aptElev, 30);
-  waypoints.push_back(wpt);
-
-  SGGeod rollOut = rwy->pointOnCenterline(rwy->lengthM() * 0.9);
-  wpt = createOnGround(ac, "Roll Out", rollOut, aptElev, 15);
-  wpt->crossat   = apt->getElevation();
-  waypoints.push_back(wpt); 
+    double vTouchdown = ac->getPerformance()->vTouchdown();
+    double vTaxi      = ac->getPerformance()->vTaxi();
+    double decel     = ac->getPerformance()->deceleration() * 1.4;
+    
+    double vTouchdownMetric = (vTouchdown  * SG_NM_TO_METER) / 3600;
+    double vTaxiMetric      = (vTaxi       * SG_NM_TO_METER) / 3600;
+    double decelMetric      = (decel       * SG_NM_TO_METER) / 3600;
+
+    //string rwyClass = getRunwayClassFromTrafficType(fltType);
+    //double heading = ac->getTrafficRef()->getCourse();
+    //apt->getDynamics()->getActiveRunway(rwyClass, 2, activeRunway, heading);
+    //rwy = apt->getRunwayByIdent(activeRunway);
+
+
+    FGAIWaypoint *wpt;
+    //double aptElev = apt->getElevation();
+    double currElev = 0;
+    char buffer[12];
+    FGRunway * rwy = apt->getRunwayByIdent(activeRunway);
+    assert( rwy != NULL );
+    SGGeod refPoint = rwy->pointOnCenterline(0);
+    FGTaxiNode *tn = 0;
+    if (apt->getDynamics()->getGroundNetwork()) {
+        int node = apt->getDynamics()->getGroundNetwork()->findNearestNode(refPoint);
+        tn = apt->getDynamics()->getGroundNetwork()->findNode(node);
+    }
+    if (tn) {
+        currElev = tn->getElevationFt(apt->getElevation());
+    } else {
+        currElev = apt->getElevation();
+    }
+
+
+    SGGeod coord;
+    
+
+    /*double distanceOut = rwy->lengthM() * .1;
+    double nPoints = 20;
+    for (int i = 1; i < nPoints; i++) {
+        snprintf(buffer, 12, "flare%d", i);
+        double currentDist = i * (distanceOut / nPoints);
+        double currentAltitude = apt->getElevation() + 20 - (i * 20 / nPoints);
+        coord = rwy->pointOnCenterline((currentDist * (i / nPoints)));
+        wpt = createInAir(ac, buffer, coord, currentAltitude, (vTouchdown));
+    }*/
+    double rolloutDistance =
+        (vTouchdownMetric * vTouchdownMetric - vTaxiMetric * vTaxiMetric) / (2 * decelMetric);
+    //cerr << " touchdown speed = " << vTouchdown << ". Rollout distance " << rolloutDistance << endl;
+    int nPoints = 50;
+    for (int i = 1; i < nPoints; i++) {
+        snprintf(buffer, 12, "landing03%d", i);
+        
+        coord = rwy->pointOnCenterline((rolloutDistance * ((double) i / (double) nPoints)));
+        wpt = createOnGround(ac, buffer, coord, currElev, 2*vTaxi);
+        wpt->setCrossat(currElev);
+        pushBackWaypoint(wpt);
+    }
+    wpt->setSpeed(vTaxi);
+    double mindist = 1.1 * rolloutDistance;
+    double maxdist = rwy->lengthM();
+    //cerr << "Finding nearest exit" << endl;
+    FGGroundNetwork *gn = apt->getDynamics()->getGroundNetwork();
+    if (gn) {
+        double min = 0;
+        for (int i = ceil(mindist); i < floor(maxdist); i++) {
+            coord = rwy->pointOnCenterline(mindist);
+            int nodeId = 0;
+            if (gn->getVersion() > 0) {
+                nodeId = gn->findNearestNodeOnRunway(coord);
+            } else {
+                nodeId = gn->findNearestNode(coord);
+            }
+            if (tn)
+                tn = gn->findNode(nodeId);
+            if (!tn)
+                break;
+            
+            double dist = SGGeodesy::distanceM(coord, tn->geod());
+            if (dist < (min + 0.75)) {
+                break;
+            }
+            min = dist;
+        }
+        if (tn) {
+            wpt = createOnGround(ac, buffer, tn->geod(), currElev, vTaxi);
+            pushBackWaypoint(wpt);
+        }
+    }
+    //cerr << "Done. " << endl;
+
+    /*
+       //Runway Threshold
+       wpt = createOnGround(ac, "Threshold", rwy->threshold(), aptElev, vTouchdown);
+       wpt->crossat = apt->getElevation();
+       pushBackWaypoint(wpt); 
+
+       // Roll-out
+       wpt = createOnGround(ac, "Center", rwy->geod(), aptElev, vTaxi*2);
+       pushBackWaypoint(wpt);
+
+       SGGeod rollOut = rwy->pointOnCenterline(rwy->lengthM() * 0.9);
+       wpt = createOnGround(ac, "Roll Out", rollOut, aptElev, vTaxi);
+       wpt->crossat   = apt->getElevation();
+       pushBackWaypoint(wpt); 
+     */
+    return true;
 }
 
 /*******************************************************************
  * CreateParking
  * initialize the Aircraft at the parking location
  ******************************************************************/
-void FGAIFlightPlan::createParking(FGAIAircraft *ac, FGAirport *apt, double radius)
+bool FGAIFlightPlan::createParking(FGAIAircraft * ac, FGAirport * apt,
+                                   double radius)
 {
-  waypoint* wpt;
-  double aptElev = apt->getElevation();
-  double lat, lat2;
-  double lon, lon2;
-  double az2;
-  double heading;
-  apt->getDynamics()->getParking(gateId, &lat, &lon, &heading);
-  heading += 180.0;
-  if (heading > 360)
-    heading -= 360; 
-  geo_direct_wgs_84 ( 0, lat, lon, heading, 
-                     2.2*radius,           
-                     &lat2, &lon2, &az2 );
-  wpt = createOnGround(ac, "taxiStart", SGGeod::fromDeg(lon2, lat2), aptElev, 10);
-  waypoints.push_back(wpt);
+    FGAIWaypoint *wpt;
+    double aptElev = apt->getElevation();
+    double vTaxi = ac->getPerformance()->vTaxi();
+    double vTaxiReduced = vTaxi * (2.0 / 3.0);
+    FGParking* parking = apt->getDynamics()->getParking(gateId);
+    if (!parking) {
+      wpt = createOnGround(ac, "END-Parking", apt->geod(), aptElev,
+                           vTaxiReduced);
+      pushBackWaypoint(wpt);
+
+      return true;
+    }
+  
+    double heading = SGMiscd::normalizePeriodic(0, 360, parking->getHeading() + 180.0);
+    double az; // unused
+    SGGeod pos;
+  
+    SGGeodesy::direct(parking->geod(), heading, 2.2 * parking->getRadius(),
+                      pos, az);
   
-  geo_direct_wgs_84 ( 0, lat, lon, heading, 
-                     0.1 *radius,           
-                     &lat2, &lon2, &az2 );
-          
-  wpt = createOnGround(ac, "taxiStart2", SGGeod::fromDeg(lon2, lat2), aptElev, 10);
-  waypoints.push_back(wpt);   
-
-  wpt = createOnGround(ac, "END", SGGeod::fromDeg(lon, lat), aptElev, 10);
-  waypoints.push_back(wpt);
+    wpt = createOnGround(ac, "taxiStart", pos, aptElev, vTaxiReduced);
+    pushBackWaypoint(wpt);
+
+    SGGeodesy::direct(parking->geod(), heading, 0.1 * parking->getRadius(),
+                    pos, az);
+    wpt = createOnGround(ac, "taxiStart2", pos, aptElev, vTaxiReduced);
+    pushBackWaypoint(wpt);
+
+    wpt = createOnGround(ac, "END-Parking", parking->geod(), aptElev,
+                       vTaxiReduced);
+    pushBackWaypoint(wpt);
+    return true;
 }
 
 /**
@@ -571,17 +1066,29 @@ void FGAIFlightPlan::createParking(FGAIAircraft *ac, FGAirport *apt, double radi
  */
 string FGAIFlightPlan::getRunwayClassFromTrafficType(string fltType)
 {
-    if ((fltType == "gate") || (fltType == "cargo")) { 
-       return string("com");
+    if ((fltType == "gate") || (fltType == "cargo")) {
+        return string("com");
     }
     if (fltType == "ga") {
-        return string ("gen");
+        return string("gen");
     }
     if (fltType == "ul") {
         return string("ul");
     }
-    if ((fltType == "mil-fighter") || (fltType == "mil-transport")) { 
-       return string("mil");
+    if ((fltType == "mil-fighter") || (fltType == "mil-transport")) {
+        return string("mil");
+    }
+    return string("com");
+}
+
+
+double FGAIFlightPlan::getTurnRadius(double speed, bool inAir)
+{
+    double turn_radius;
+    if (inAir == false) {
+        turn_radius = ((360 / 30) * fabs(speed)) / (2 * M_PI);
+    } else {
+        turn_radius = 0.1911 * speed * speed;   // an estimate for 25 degrees bank
     }
-   return string("com");
+    return turn_radius;
 }