Merge branch 'jmt/cleanup' into next

[flightgear.git] / src / Navaids / navrecord.cxx

diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx
index 2689f3d3bc4a3fb4065574c1718509b09d487ec3..6bb71a54c9d2e40e3506b4e17e451b910e80fd94 100644 (file)
--- a/src/Navaids/navrecord.cxx
+++ b/src/Navaids/navrecord.cxx
@@ -27,13 +27,19 @@
 #include <istream>
 
 #include <simgear/misc/sgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/sg_inlines.h>
+#include <simgear/props/props.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Navaids/navrecord.hxx>
 #include <Navaids/navdb.hxx>
 #include <Airports/runways.hxx>
+#include <Airports/simple.hxx>
+#include <Airports/xmlloader.hxx>
+
 #include <Main/fg_props.hxx>
 
 FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, 
@@ -84,13 +90,18 @@ void FGNavRecord::initAirportRelation()
     return; // not airport-located
   }
   
-  mRunway = getRunwayFromName(_name);    
+  mRunway = getRunwayFromName(_name);  
+  
+  if (type() != GS) {
+    readAirportSceneryData();
+  }
+        
   // fudge elevation to the runway elevation if it's not specified
   if (fabs(elevation()) < 0.01) {
     mPosition.setElevationFt(mRunway->elevation());
   }
   
-  if (type() == ILS) {
+  if (type() == ILS || type() == LOC) {
     mRunway->setILS(this);
   }
   
@@ -106,12 +117,51 @@ void FGNavRecord::initAirportRelation()
   }
 }
 
+void FGNavRecord::readAirportSceneryData()
+{
+  // allow users to disable the scenery data in the short-term
+  // longer term, this option can probably disappear
+  if (!fgGetBool("/sim/use-scenery-airport-data")) {
+    return; 
+  }
+  
+  SGPath path;
+  SGPropertyNode_ptr rootNode = new SGPropertyNode;
+  if (!XMLLoader::findAirportData(mRunway->airport()->ident(), "ils", path)) {
+    return;
+  }
+  
+  readProperties(path.str(), rootNode);
+  SGPropertyNode* runwayNode, *ilsNode;
+  for (int i=0; (runwayNode = rootNode->getChild("runway", i)) != NULL; ++i) {
+    for (int j=0; (ilsNode = runwayNode->getChild("ils", j)) != NULL; ++j) {
+      // must match on both nav-ident and runway ident, to support the following:
+      // - runways with multiple distinct ILS installations (KEWD, for example)
+      // - runways where both ends share the same nav ident (LFAT, for example)
+      if ((ilsNode->getStringValue("nav-id") == ident()) &&
+          (ilsNode->getStringValue("rwy") == mRunway->ident())) {
+        processSceneryILS(ilsNode);
+        return;
+      }
+    } // of ILS iteration
+  } // of runway iteration
+}
+
+void FGNavRecord::processSceneryILS(SGPropertyNode* aILSNode)
+{
+  double hdgDeg = aILSNode->getDoubleValue("hdg-deg"),
+    lon = aILSNode->getDoubleValue("lon"),
+    lat = aILSNode->getDoubleValue("lat"),
+    elevM = aILSNode->getDoubleValue("elev-m");
+    
+  mPosition = SGGeod::fromDegM(lon, lat, elevM);
+  multiuse = hdgDeg;
+}
+
 void FGNavRecord::alignLocaliserWithRunway(double aThreshold)
 {
 // find the distance from the threshold to the localizer
-  SGGeod runwayThreshold(mRunway->threshold());
-  double dist, az1, az2;
-  SGGeodesy::inverse(mPosition, runwayThreshold, az1, az2, dist);
+  double dist = SGGeodesy::distanceM(mPosition, mRunway->threshold());
 
 // back project that distance along the runway center line
   SGGeod newPos = mRunway->pointOnCenterline(dist);
@@ -120,10 +170,10 @@ void FGNavRecord::alignLocaliserWithRunway(double aThreshold)
   SG_NORMALIZE_RANGE(hdg_diff, -180.0, 180.0);
 
   if ( fabs(hdg_diff) <= aThreshold ) {
-    mPosition = newPos;
+    mPosition = SGGeod::fromGeodFt(newPos, mPosition.getElevationFt());
     set_multiuse( mRunway->headingDeg() );
   } else {
-    SG_LOG(SG_GENERAL, SG_WARN, "localizer:" << ident() << ", aligning with runway " 
+    SG_LOG(SG_GENERAL, SG_DEBUG, "localizer:" << ident() << ", aligning with runway " 
       << mRunway->ident() << " exceeded heading threshold");
   }
 }