X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAirports%2Frunways.cxx;h=3eb853823e4d39f0927fcba599c71f3d08750217;hb=386aefe69358ce41a11c9afeb8f56e26758fe56b;hp=5adfba4f8ac19ec9910a4797b5282526fe17747b;hpb=18d1593c42c2df60d7fb44ace722ca3e8a7fd82c;p=flightgear.git

diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index 5adfba4f8..3eb853823 100644
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@@ -30,6 +30,8 @@
 
 #include <simgear/compiler.h>
 
+#include <simgear/props/props.hxx>
+
 #include <string>
 
 #include "runways.hxx"
@@ -69,9 +71,11 @@ FGRunway::FGRunway(FGAirport* aAirport, const string& aIdent,
                         bool reciprocal) :
   FGRunwayBase(RUNWAY, cleanRunwayNo(aIdent), aGeod, heading, length, width, surface_code, true),
   _airport(aAirport),
-  _reciprocal(reciprocal),
+  _isReciprocal(reciprocal),
+  _reciprocal(NULL),
   _displ_thresh(displ_thresh),
-  _stopway(stopway)
+  _stopway(stopway),
+  _ils(NULL)
 {
 }
 
@@ -120,18 +124,46 @@ double FGRunway::score(double aLengthWt, double aWidthWt, double aSurfaceWt) con
   return _length * aLengthWt + _width * aWidthWt + surface * aSurfaceWt + 1e-20;
 }
 
-SGGeod FGRunway::threshold() const
+SGGeod FGRunway::begin() const
 {
   return pointOnCenterline(0.0);
 }
 
-SGGeod FGRunway::reverseThreshold() const
+SGGeod FGRunway::end() const
 {
   return pointOnCenterline(lengthM());
 }
 
-SGGeod FGRunway::displacedThreshold() const
+SGGeod FGRunway::threshold() const
 {
   return pointOnCenterline(_displ_thresh * SG_FEET_TO_METER);
 }
 
+void FGRunway::processThreshold(SGPropertyNode* aThreshold)
+{
+  assert(ident() == aThreshold->getStringValue("rwy"));
+  
+  double lon = aThreshold->getDoubleValue("lon"),
+    lat = aThreshold->getDoubleValue("lat");
+  SGGeod newThreshold(SGGeod::fromDegM(lon, lat, mPosition.getElevationM()));
+  
+  _heading = aThreshold->getDoubleValue("hdg-deg");
+  _displ_thresh = aThreshold->getDoubleValue("displ-m") * SG_METER_TO_FEET;
+  _stopway = aThreshold->getDoubleValue("stopw-m") * SG_METER_TO_FEET;
+  
+  // compute the new runway center, based on the threshold lat/lon and length,
+  double offsetFt = (0.5 * _length);
+  SGGeod newCenter;
+  double dummy;
+  SGGeodesy::direct(newThreshold, _heading, offsetFt * SG_FEET_TO_METER, newCenter, dummy);
+  mPosition = newCenter;
+} 
+
+void FGRunway::setReciprocalRunway(FGRunway* other)
+{
+  assert(_reciprocal==NULL);
+  assert((other->_reciprocal == NULL) || (other->_reciprocal == this));
+  
+  _reciprocal = other;
+}
+