#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,
multiuse(aMultiuse),
_name(aName),
mRunway(NULL),
- serviceable(true),
- trans_ident(aIdent)
+ serviceable(true)
{
initAirportRelation();
// 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:
}
if (type() != GS) {
- readAirportSceneryData();
+ SGPropertyNode* ilsData = ilsDataForRunwayAndNavaid(mRunway, ident());
+ if (ilsData) {
+ processSceneryILS(ilsData);
+ }
}
// fudge elevation to the runway elevation if it's not specified
}
}
-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"),