fly/flightgear
1
0
Fork 0
Code Activity

RNAV: use runway departure end for previous wpt.

Browse source 
Should fix leg computation following a runway waypt.
This commit is contained in:
James Turner 2015-01-10 19:35:11 +00:00
parent 6b9aa0fb97
commit cc2a78b70b
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Instrumentation/gps.cxx
View file

@ -462,13 +462,20 @@ SGGeod GPS::previousLegWaypointPosition(bool& isValid)
FlightPlan::Leg* leg = _route->previousLeg(); FlightPlan::Leg* leg = _route->previousLeg();
if (leg){ if (leg){
Waypt* waypt = leg->waypoint(); Waypt* waypt = leg->waypoint();
if(waypt){ if (waypt) {
isValid = true; 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(); return waypt->position();
} }
} }
isValid = false; isValid = false;
return SGGeod(); return SGGeod();
} }
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////