X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAirports%2Fxmlloader.cxx;h=8b35cabd5b03bab346f5df79fd9f2ec9f8a83219;hb=72131a4a4971df690ec5004977ee8eca1d0aa114;hp=f2f81daf975178e4ae1fa589b872dbbaefd2ad52;hpb=1c015387baa3b65344024623fc1bc10e11f3866b;p=flightgear.git

diff --git a/src/Airports/xmlloader.cxx b/src/Airports/xmlloader.cxx
index f2f81daf9..8b35cabd5 100644
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@@ -13,9 +13,13 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 
-#include <simgear/misc/sg_path.hxx>
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
 
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/xml/easyxml.hxx>
+#include <simgear/misc/strutils.hxx>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
@@ -25,6 +29,7 @@
 #include "runwayprefloader.hxx"
 
 #include "dynamics.hxx"
+#include "simple.hxx"
 #include "runwayprefs.hxx"
 
 using std::string;
@@ -32,142 +37,45 @@ using std::string;
 XMLLoader::XMLLoader() {}
 XMLLoader::~XMLLoader() {}
 
-string XMLLoader::expandICAODirs(const string& in){
-     //cerr << "Expanding " << in << endl;
-     if (in.size() == 4) {
-          char buffer[11];
-          snprintf(buffer, 11, "%c/%c/%c", in[0], in[1], in[2]);
-          //cerr << "result: " << buffer << endl;
-          return string(buffer);
-     } else {
-           return in;
-     }
-     //exit(1);
-}
-
-void XMLLoader::load(FGAirportDynamics* d) {
-    FGAirportDynamicsXMLLoader visitor(d);
-    if (fgGetBool("/sim/traffic-manager/use-custom-scenery-data") == false) {
-       SGPath parkpath( globals->get_fg_root() );
-       parkpath.append( "/AI/Airports/" );
-       parkpath.append( d->getId() );
-       parkpath.append( "parking.xml" );
-       SG_LOG(SG_GENERAL, SG_DEBUG, "running old loader:" << parkpath.c_str());
-       if (parkpath.exists()) {
-           try {
-               readXML(parkpath.str(), visitor);
-               d->init();
-           } 
-           catch (const sg_exception &) {
-           }
-       }
-    } else {
-        string_list sc = globals->get_fg_scenery();
-        char buffer[32];
-        snprintf(buffer, 32, "%s.groundnet.xml", d->getId().c_str() );
-        string airportDir = XMLLoader::expandICAODirs(d->getId());
-        for (string_list_iterator i = sc.begin(); i != sc.end(); i++) {
-            SGPath parkpath( *i );
-            parkpath.append( "Airports" );
-            parkpath.append ( airportDir );
-            parkpath.append( string (buffer) );
-            SG_LOG(SG_GENERAL, SG_DEBUG, "Trying to read ground net:" << parkpath.c_str());
-            if (parkpath.exists()) {
-                SG_LOG(SG_GENERAL, SG_DEBUG, "reading ground net:" << parkpath.c_str());
-                try {
-                    readXML(parkpath.str(), visitor);
-                    d->init();
-                } 
-                catch (const sg_exception &) {
-                }
-                return;
-            }
-        }
-    }
+void XMLLoader::load(FGAirportDynamics* d)
+{
+  FGAirportDynamicsXMLLoader visitor(d);
+  if(loadAirportXMLDataIntoVisitor(d->parent()->ident(), "groundnet", visitor)) {
+    d->init();
+  }
 }
 
 void XMLLoader::load(FGRunwayPreference* p) {
-    FGRunwayPreferenceXMLLoader visitor(p);
-    if (fgGetBool("/sim/traffic-manager/use-custom-scenery-data") == false) {
-        SGPath rwyPrefPath( globals->get_fg_root() );
-        rwyPrefPath.append( "AI/Airports/" );
-        rwyPrefPath.append( p->getId() );
-        rwyPrefPath.append( "rwyuse.xml" );
-        if (rwyPrefPath.exists()) {
-            try {
-                readXML(rwyPrefPath.str(), visitor);
-            } 
-            catch (const sg_exception &) {
-            }
-         }
-      }  else {
-       string_list sc = globals->get_fg_scenery();
-       char buffer[32];
-       snprintf(buffer, 32, "%s.rwyuse.xml", p->getId().c_str() );
-       string airportDir = expandICAODirs(p->getId());
-       for (string_list_iterator i = sc.begin(); i != sc.end(); i++) {
-           SGPath rwypath( *i );
-           rwypath.append( "Airports" );
-           rwypath.append ( airportDir );
-           rwypath.append( string(buffer) );
-           if (rwypath.exists()) {
-               try {
-                   readXML(rwypath.str(), visitor);
-                } 
-                catch (const sg_exception &) {
-                }
-                return;
-            }
-        }
-    }
-}
-
-void XMLLoader::load(FGSidStar* p) {
-    //FGRunwayPreferenceXMLLoader visitor(p);
-    if (fgGetBool("/sim/traffic-manager/use-custom-scenery-data") == true) {
-       string_list sc = globals->get_fg_scenery();
-       char buffer[32];
-       snprintf(buffer, 32, "%s.SID.xml", p->getId().c_str() );
-       string airportDir = expandICAODirs(p->getId());
-       for (string_list_iterator i = sc.begin(); i != sc.end(); i++) {
-           SGPath sidpath( *i );
-           sidpath.append( "Airports" );
-           sidpath.append ( airportDir );
-           sidpath.append( string(buffer) );
-           if (sidpath.exists()) {
-               try {
-                   //readXML(rwypath.str(), visitor);
-                   //cerr << "Reading SID procedure : " << sidpath.str() << endl;
-                   p->load(sidpath);
-                } 
-                catch (const sg_exception &) {
-                }
-                return;
-            }
-        }
-    }
+  FGRunwayPreferenceXMLLoader visitor(p);
+  loadAirportXMLDataIntoVisitor(p->getId(), "rwyuse", visitor);
 }
 
 bool XMLLoader::findAirportData(const std::string& aICAO, 
     const std::string& aFileName, SGPath& aPath)
 {
+  string fileName(aFileName);
+  if (!simgear::strutils::ends_with(aFileName, ".xml")) {
+    fileName.append(".xml");
+  }
+  
   string_list sc = globals->get_fg_scenery();
   char buffer[128];
-  ::snprintf(buffer, 128, "%c/%c/%c/%s.%s.xml", 
+  ::snprintf(buffer, 128, "%c/%c/%c/%s.%s", 
     aICAO[0], aICAO[1], aICAO[2], 
-    aICAO.c_str(), aFileName.c_str());
+    aICAO.c_str(), fileName.c_str());
 
   for (string_list_iterator it = sc.begin(); it != sc.end(); ++it) {
-    SGPath path(*it);
-    path.append("Airports");
-    path.append(string(buffer));
-    if (path.exists()) {
-      aPath = path;
-      return true;
-    } // of path exists
+    // fg_senery contains empty strings as "markers" (see FGGlobals::set_fg_scenery)
+    if (!it->empty()) {
+        SGPath path(*it);
+        path.append("Airports");
+        path.append(string(buffer));
+        if (path.exists()) {
+          aPath = path;
+          return true;
+        } // of path exists
+    }
   } // of scenery path iteration
-
-
   return false;
 }
 
@@ -176,9 +84,11 @@ bool XMLLoader::loadAirportXMLDataIntoVisitor(const string& aICAO,
 {
   SGPath path;
   if (!findAirportData(aICAO, aFileName, path)) {
+    SG_LOG(SG_GENERAL, SG_DEBUG, "loadAirportXMLDataIntoVisitor: failed to find data for " << aICAO << "/" << aFileName);
     return false;
   }
 
+  SG_LOG(SG_GENERAL, SG_DEBUG, "loadAirportXMLDataIntoVisitor: loading from " << path.str());
   readXML(path.str(), aVisitor);
   return true;
 }