RNAV: use runway departure end for previous wpt.

Should fix leg computation following a runway waypt.

diff --git a/src/Instrumentation/gps.cxx b/src/Instrumentation/gps.cxx
index 3b3fa726bbda34951d3b3eb3a489a6605998dc77..9b808627e3f3597ebfa7acfa5b704c15426ed248 100644 (file)
--- a/src/Instrumentation/gps.cxx
+++ b/src/Instrumentation/gps.cxx
@@ -462,13 +462,20 @@ SGGeod GPS::previousLegWaypointPosition(bool& isValid)
        FlightPlan::Leg* leg = _route->previousLeg();
        if (leg){
                Waypt* waypt = leg->waypoint();
-               if(waypt){
-                       isValid = true;
+               if (waypt) {
+            isValid = true;
+            // ensure computations use runway end, not threshold
+            if (waypt->type() == "runway") {
+                RunwayWaypt* rwpt = static_cast<RunwayWaypt*>(waypt);
+                return rwpt->runway()->end();
+            }
+
                        return waypt->position();
                }
        }
+
        isValid = false;
-  return SGGeod();
+    return SGGeod();
 }
 ///////////////////////////////////////////////////////////////////////////