X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FAirports%2Fxmlloader.cxx;h=9487144c99817ed42361776b9d4c495d19c368c7;hb=386aefe69358ce41a11c9afeb8f56e26758fe56b;hp=1448c84f9e6fc473e3a2323b4c2ed0cd7aafc747;hpb=7dfae1562bdb68d0c67e728f3f922c6373b83c9c;p=flightgear.git

diff --git a/src/Airports/xmlloader.cxx b/src/Airports/xmlloader.cxx
index 1448c84f9..9487144c9 100644
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@@ -1,5 +1,24 @@
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+//
+
 #include <simgear/misc/sg_path.hxx>
+
+#include <simgear/xml/easyxml.hxx>
+
 #include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
 
 #include "xmlloader.hxx"
 #include "dynamicloader.hxx"
@@ -8,43 +27,92 @@
 #include "dynamics.hxx"
 #include "runwayprefs.hxx"
 
+using std::string;
+
 XMLLoader::XMLLoader() {}
 XMLLoader::~XMLLoader() {}
 
 void XMLLoader::load(FGAirportDynamics* d) {
   FGAirportDynamicsXMLLoader visitor(d);
-
-  SGPath parkpath( globals->get_fg_root() );
-  parkpath.append( "/AI/Airports/" );
-  parkpath.append( d->getId() );
-  parkpath.append( "parking.xml" );
-  
-  if (parkpath.exists()) {
-    try {
-      readXML(parkpath.str(), visitor);
-      d->init();
-    } catch (const sg_exception &e) {
-      //cerr << "unable to read " << parkpath.str() << endl;
+  if (fgGetBool("/sim/paths/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 {
+    if(loadAirportXMLDataIntoVisitor(d->getId(), "groundnet", visitor)) {
+        d->init();
     }
   }
-
 }
 
 void XMLLoader::load(FGRunwayPreference* p) {
   FGRunwayPreferenceXMLLoader visitor(p);
+  if (fgGetBool("/sim/paths/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 {
+    loadAirportXMLDataIntoVisitor(p->getId(), "rwyuse", visitor);
+  }
+}
 
-  SGPath rwyPrefPath( globals->get_fg_root() );
-  rwyPrefPath.append( "AI/Airports/" );
-  rwyPrefPath.append( p->getId() );
-  rwyPrefPath.append( "rwyuse.xml" );
-
-  //if (ai_dirs.find(id.c_str()) != ai_dirs.end()
-  //  && rwyPrefPath.exists())
-  if (rwyPrefPath.exists()) {
-    try {
-      readXML(rwyPrefPath.str(), visitor);
-    } catch (const sg_exception &e) {
-      //cerr << "unable to read " << rwyPrefPath.str() << endl;
-    }
+void XMLLoader::load(FGSidStar* p) {
+  SGPath path;
+  if (findAirportData(p->getId(), "SID", path)) {
+    p->load(path);
   }
 }
+
+bool XMLLoader::findAirportData(const std::string& aICAO, 
+    const std::string& aFileName, SGPath& aPath)
+{
+  string_list sc = globals->get_fg_scenery();
+  char buffer[128];
+  ::snprintf(buffer, 128, "%c/%c/%c/%s.%s.xml", 
+    aICAO[0], aICAO[1], aICAO[2], 
+    aICAO.c_str(), aFileName.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
+  } // of scenery path iteration
+  return false;
+}
+
+bool XMLLoader::loadAirportXMLDataIntoVisitor(const string& aICAO, 
+    const string& aFileName, XMLVisitor& aVisitor)
+{
+  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;
+}
+