X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Fnavrecord.cxx;h=8c01c6a1025a5535c21ce23c0e2abf03fa25940d;hb=038251e8af6ff9c24afcc08169c2bcca2c5a63c5;hp=a22bebb69b431f7f6dec13701adb0a6318531488;hpb=dae7e961c9521e4b797140268e3284b3c0d3f947;p=flightgear.git diff --git a/src/Navaids/navrecord.cxx b/src/Navaids/navrecord.cxx index a22bebb69..8c01c6a10 100644 --- a/src/Navaids/navrecord.cxx +++ b/src/Navaids/navrecord.cxx @@ -32,7 +32,7 @@ #include #include #include -#include + #include #include @@ -41,6 +41,7 @@ #include #include
+#include FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, const std::string& aName, const SGGeod& aPos, @@ -60,7 +61,7 @@ FGNavRecord::FGNavRecord(Type aTy, const std::string& aIdent, // assign our own defaults, unless the range is not set for some // reason. if (range < 0.1) { - SG_LOG(SG_GENERAL, SG_WARN, "navaid " << ident() << " has no range set, using defaults"); + SG_LOG(SG_GENERAL, SG_DEBUG, "navaid " << ident() << " has no range set, using defaults"); switch (type()) { case NDB: case VOR: @@ -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)