Prepare and implement reinit methods for instruments

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

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index 96d38c153ed49077e5d4ecb47429431534bd60ca..385e1db22510cc2e29ede392965fe15ed3e8dae3 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -47,6 +47,7 @@
 #include <Main/fg_props.hxx>
 
 using std::string;
+using std::vector;
 
 typedef std::map<FGAirport*, SGPropertyNode_ptr> AirportPropertyMap;
 
@@ -240,10 +241,6 @@ bool fgNavDBInit( FGNavList *navlist, FGNavList *loclist, FGNavList *gslist,
 
 SGPropertyNode* ilsDataForRunwayAndNavaid(FGRunway* aRunway, const std::string& aNavIdent)
 {
-  if (!fgGetBool("/sim/paths/use-custom-scenery-data")) {
-    return NULL; 
-  }
-  
   if (!aRunway) {
     return NULL;
   }
@@ -297,12 +294,12 @@ FGRunway* getRunwayFromName(const std::string& aName)
   
   const FGAirport* apt = fgFindAirportID(parts[0]);
   if (!apt) {
-    SG_LOG(SG_GENERAL, SG_WARN, "navaid " << aName << " associated with bogus airport ID:" << parts[0]);
+    SG_LOG(SG_GENERAL, SG_DEBUG, "navaid " << aName << " associated with bogus airport ID:" << parts[0]);
     return NULL;
   }
   
   if (!apt->hasRunwayWithIdent(parts[1])) {
-    SG_LOG(SG_GENERAL, SG_WARN, "navaid " << aName << " associated with bogus runway ID:" << parts[1]);
+    SG_LOG(SG_GENERAL, SG_DEBUG, "navaid " << aName << " associated with bogus runway ID:" << parts[1]);
     return NULL;
   }