NewAtis: handle varying winds

[flightgear.git] / src / Airports / runwaybase.cxx

diff --git a/src/Airports/runwaybase.cxx b/src/Airports/runwaybase.cxx
index 83c8389263b2ab4c7bdd00e36ac16e7f896c226f..4f60682a9a75b36ecaacee90276e70be39349fcd 100644 (file)
--- a/src/Airports/runwaybase.cxx
+++ b/src/Airports/runwaybase.cxx
@@ -61,11 +61,8 @@ FGRunwayBase::FGRunwayBase(PositionedID aGuid, Type aTy, const string& aIdent,
 
 SGGeod FGRunwayBase::pointOnCenterline(double aOffset) const
 {
-  double halfLengthMetres = lengthM() * 0.5;
-  
-  SGGeod result = SGGeodesy::direct(mPosition, _heading,
-    aOffset - halfLengthMetres);
-  result.setElevationM(mPosition.getElevationM());
+  SGGeod result = SGGeodesy::direct(geod(), _heading, aOffset);
+  result.setElevationM(geod().getElevationM());
     
   return result;
 }
@@ -75,13 +72,10 @@ SGGeod FGRunwayBase::pointOffCenterline(double aOffset, double lateralOffset) co
   SGGeod result;
   SGGeod temp;
   double dummyAz2;
-  double halfLengthMetres = lengthM() * 0.5;
 
-  SGGeodesy::direct(mPosition, _heading, 
-    aOffset - halfLengthMetres,
-    temp, dummyAz2);
+  SGGeodesy::direct(geod(), _heading, aOffset, temp, dummyAz2);
 
-  SGGeodesy::direct(temp, (_heading+90.0), 
+  SGGeodesy::direct(temp, SGMiscd::normalizePeriodic(0, 360,_heading+90.0),
     lateralOffset,
     result, dummyAz2);