fly/flightgear
1
0
Fork 0
Code Activity

Fix two route path issues found by Hyde

Browse source 
- course computation from a runway was wrong (used threshold pos)
- negative distance along path was using wrong distance to offset
This commit is contained in:
James Turner 2015-01-02 09:47:54 +00:00
parent 49ce7cd318
commit 6db45dac9d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Navaids/routePath.cxx
View file

@ -147,7 +147,13 @@ public:
} }
// we can compute leg course now // we can compute leg course now
legCourseTrue = SGGeodesy::courseDeg(previous.pos, pos); if (previous.wpt->type() == "runway") {
// use the runway departure end pos
legCourseTrue = SGGeodesy::courseDeg(previous.turnExitPos, pos);
} else {
legCourseTrue = SGGeodesy::courseDeg(previous.pos, pos);
}
legCourseValid = true; legCourseValid = true;
} }
} }
@ -947,8 +953,12 @@ SGGeod RoutePath::positionForDistanceFrom(int index, double distanceM) const
if (distanceM < 0.0) { if (distanceM < 0.0) {
// scan backwards // scan backwards
while ((index > 0) && (distanceM < 0.0)) { while ((index > 0) && (distanceM < 0.0)) {
--index; // we are looking at index n, say 4, but with a negative distance.
// we want to look at index n-1 (so, 3), and see if this makes
// distance positive. We need to offset by distance from 3 -> 4,
// which is waypoint 4's path distance.
distanceM += d->waypoints[index].pathDistanceM; distanceM += d->waypoints[index].pathDistanceM;
--index;
} }
if (distanceM < 0.0) { if (distanceM < 0.0) {