#346 related: missing status message for property server

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

diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx
index a22bebb69b431f7f6dec13701adb0a6318531488..5edc64ef180c2babd21b71e19b06eb617eea3de3 100644 (file)
--- a/src/Navaids/navrecord.cxx
+++ b/src/Navaids/navrecord.cxx
@@ -32,7 +32,7 @@
 #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>
@@ -41,6 +41,7 @@
 #include <Airports/xmlloader.hxx>
 
 #include <Main/fg_props.hxx>
+#include <Navaids/PositionedBinding.hxx>
 
 FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, 
   const std::string& aName, const SGGeod& aPos,
@@ -97,7 +98,10 @@ void FGNavRecord::initAirportRelation()
   }
   
   if (type() != GS) {
-    readAirportSceneryData();
+    SGPropertyNode* ilsData = ilsDataForRunwayAndNavaid(mRunway, ident());
+    if (ilsData) {
+      processSceneryILS(ilsData);
+    }
   }
         
   // fudge elevation to the runway elevation if it's not specified
@@ -121,36 +125,6 @@ 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"),
@@ -214,6 +188,13 @@ double FGNavRecord::localizerWidth() const
 
 }
 
+flightgear::PositionedBinding*
+FGNavRecord::createBinding(SGPropertyNode* nd) const
+{
+    return new flightgear::NavaidBinding(this, nd);
+}
+
+
 FGTACANRecord::FGTACANRecord(void) :
     channel(""),
     freq(0)