From: James Turner <zakalawe@mac.com>
Date: Tue, 1 Jan 2013 13:49:12 +0000 (+0000)
Subject: Tweak normalisation of route-path segments.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f48ad2f20bf00483b6cbbb97c57a0e5773735a3d;p=flightgear.git

Tweak normalisation of route-path segments.

KATL -> KLAX looks correct now. Great-circles that span the 180-meridian are still rendered wrong, but that's a map projection issues, which I will fix in the next few days.
---

diff --git a/src/Navaids/routePath.cxx b/src/Navaids/routePath.cxx
index e17c8c462..afbd62854 100644
--- a/src/Navaids/routePath.cxx
+++ b/src/Navaids/routePath.cxx
@@ -147,13 +147,13 @@ void RoutePath::interpolateGreatCircle(const SGGeod& aFrom, const SGGeod& aTo, S
     return;
   }
   
-  lonDelta = SGMiscd::normalizeAngle2(lonDelta);
-
+  lonDelta = SGMiscd::normalizeAngle(lonDelta);    
   int steps = static_cast<int>(fabs(lonDelta) * SG_RADIANS_TO_DEGREES * 2);
   double lonStep = (lonDelta / steps);
   
   double lon = gcFrom.getLongitudeRad() + lonStep;
   for (int s=0; s < (steps - 1); ++s) {
+    lon = SGMiscd::normalizeAngle(lon);
     double lat = latitudeForGCLongitude(gcFrom, gcTo, lon);
     r.push_back(SGGeod::fromGeoc(SGGeoc::fromRadM(lon, lat, SGGeodesy::EQURAD)));
     //SG_LOG(SG_GENERAL, SG_INFO, "lon:" << lon * SG_RADIANS_TO_DEGREES << " gives lat " << lat * SG_RADIANS_TO_DEGREES);