X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAirports%2Frunways.cxx;h=84205a27620a9de91f27cf0e6c69170aa31d6bc7;hb=81cd33e2fa9b5930784d3aed920eea0e3038e7f7;hp=bd2df3038ceddcb1c9d7fa2528a24a9958ab5d53;hpb=2ef1e5be521fffae3f8ce73b4ef09351ce516852;p=flightgear.git

diff --git a/src/Airports/runways.cxx b/src/Airports/runways.cxx
index bd2df3038..84205a276 100644
--- a/src/Airports/runways.cxx
+++ b/src/Airports/runways.cxx
@@ -37,51 +37,28 @@
 
 #include "runways.hxx"
 
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Navaids/procedure.hxx>
 #include <Navaids/navrecord.hxx>
-#include <Navaids/PositionedBinding.hxx>
+#include <Navaids/NavDataCache.hxx>
 
 using std::string;
 
-static std::string cleanRunwayNo(const std::string& aRwyNo)
-{
-  if (aRwyNo[0] == 'x') {
-    return std::string(); // no ident for taxiways
-  }
-  
-  string result(aRwyNo);
-  // canonicalise runway ident
-  if ((aRwyNo.size() == 1) || !isdigit(aRwyNo[1])) {
-	  result = "0" + aRwyNo;
-  }
-
-  // trim off trailing garbage
-  if (result.size() > 2) {
-    char suffix = toupper(result[2]);
-    if (suffix == 'X') {
-       result = result.substr(0, 2);
-    }
-  }
-  
-  return result;
-}
-
-FGRunway::FGRunway(FGAirport* aAirport, const string& aIdent,
+FGRunway::FGRunway(PositionedID aGuid,
+                   PositionedID aAirport, const string& aIdent,
                         const SGGeod& aGeod,
                         const double heading, const double length,
                         const double width,
                         const double displ_thresh,
                         const double stopway,
-                        const int surface_code,
-                        bool reciprocal) :
-  FGRunwayBase(RUNWAY, cleanRunwayNo(aIdent), aGeod, heading, length, width, surface_code, true),
+                        const int surface_code) :
+  FGRunwayBase(aGuid, RUNWAY, aIdent, aGeod,
+               heading, length, width, surface_code),
   _airport(aAirport),
-  _isReciprocal(reciprocal),
-  _reciprocal(NULL),
+  _reciprocal(0),
   _displ_thresh(displ_thresh),
   _stopway(stopway),
-  _ils(NULL)
+  _ils(0)
 {
 }
 
@@ -142,42 +119,51 @@ SGGeod FGRunway::end() const
 
 SGGeod FGRunway::threshold() const
 {
-  return pointOnCenterline(_displ_thresh * SG_FEET_TO_METER);
+  return pointOnCenterline(_displ_thresh);
 }
 
-void FGRunway::processThreshold(SGPropertyNode* aThreshold)
+void FGRunway::setReciprocalRunway(PositionedID other)
 {
-  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;
+  assert(_reciprocal==0);  
+  _reciprocal = other;
+}
+
+FGAirport* FGRunway::airport() const
+{
+  return loadById<FGAirport>(_airport);
+}
+
+FGRunway* FGRunway::reciprocalRunway() const
+{
+  return loadById<FGRunway>(_reciprocal);
+}
+
+FGNavRecord* FGRunway::ILS() const
+{
+  if (_ils == 0) {
+    return NULL;
+  }
   
-  // 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)
+  return loadById<FGNavRecord>(_ils);
+}
+
+FGNavRecord* FGRunway::glideslope() const
 {
-  assert(_reciprocal==NULL);
-  assert((other->_reciprocal == NULL) || (other->_reciprocal == this));
+  flightgear::NavDataCache* cache = flightgear::NavDataCache::instance();
+  PositionedID gsId = cache->findNavaidForRunway(guid(), FGPositioned::GS);
+  if (gsId == 0) {
+    return NULL;
+  }
   
-  _reciprocal = other;
+  return loadById<FGNavRecord>(gsId);
 }
 
-std::vector<flightgear::SID*> FGRunway::getSIDs()
+flightgear::SIDList FGRunway::getSIDs() const
 {
-  std::vector<flightgear::SID*> result;
-  for (unsigned int i=0; i<_airport->numSIDs(); ++i) {
-    flightgear::SID* s = _airport->getSIDByIndex(i);
+  FGAirport* apt = airport();
+  flightgear::SIDList result;
+  for (unsigned int i=0; i<apt->numSIDs(); ++i) {
+    flightgear::SID* s = apt->getSIDByIndex(i);
     if (s->isForRunway(this)) {
       result.push_back(s);
     }
@@ -186,11 +172,12 @@ std::vector<flightgear::SID*> FGRunway::getSIDs()
   return result;
 }
 
-std::vector<flightgear::STAR*> FGRunway::getSTARs()
+flightgear::STARList FGRunway::getSTARs() const
 {
-  std::vector<flightgear::STAR*> result;
-  for (unsigned int i=0; i<_airport->numSTARs(); ++i) {
-    flightgear::STAR* s = _airport->getSTARByIndex(i);
+  FGAirport* apt = airport();
+  flightgear::STARList result;
+  for (unsigned int i=0; i<apt->numSTARs(); ++i) {
+    flightgear::STAR* s = apt->getSTARByIndex(i);
     if (s->isForRunway(this)) {
       result.push_back(s);
     }
@@ -199,9 +186,31 @@ std::vector<flightgear::STAR*> FGRunway::getSTARs()
   return result;
 }
 
-flightgear::PositionedBinding*
-FGRunway::createBinding(SGPropertyNode* nd) const
+flightgear::ApproachList
+FGRunway::getApproaches(flightgear::ProcedureType type) const
 {
-    return new flightgear::RunwayBinding(this, nd);
+  FGAirport* apt = airport();
+  flightgear::ApproachList result;
+  for (unsigned int i=0; i<apt->numApproaches(); ++i)
+  {
+    flightgear::Approach* s = apt->getApproachByIndex(i);
+    if(    s->runway() == this
+        && (type == flightgear::PROCEDURE_INVALID || type == s->type()) )
+    {
+      result.push_back(s);
+    }
+  } // of approaches at the airport iteration
+  
+  return result;
 }
 
+FGHelipad::FGHelipad(PositionedID aGuid,
+                        PositionedID aAirport, const string& aIdent,
+                        const SGGeod& aGeod,
+                        const double heading, const double length,
+                        const double width,
+                        const int surface_code) :
+  FGRunwayBase(aGuid, RUNWAY, aIdent, aGeod,
+               heading, length, width, surface_code)
+{
+}