testair.cxx is a 21 lines long, obsolete test application. After removing

[flightgear.git] / src / Airports / xmlloader.cxx

diff --git a/src/Airports/xmlloader.cxx b/src/Airports/xmlloader.cxx
index 1009f8a0e4ac76e5310ae1e4ad6766ed1e207efa..7005ca52a72a6fa28b157bf0626d6652659d73d2 100644 (file)
--- a/src/Airports/xmlloader.cxx
+++ b/src/Airports/xmlloader.cxx
@@ -14,7 +14,9 @@
 //
 
 #include <simgear/misc/sg_path.hxx>
+
 #include <Main/globals.hxx>
+#include <Main/fg_props.hxx>
 
 #include "xmlloader.hxx"
 #include "dynamicloader.hxx"
@@ -27,11 +29,11 @@ XMLLoader::XMLLoader() {}
 XMLLoader::~XMLLoader() {}
 
 string XMLLoader::expandICAODirs(const string in){
-     cerr << "Expanding " << in << endl;
+     //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;
+          //cerr << "result: " << buffer << endl;
           return string(buffer);
      } else {
            return in;
@@ -46,6 +48,7 @@ void XMLLoader::load(FGAirportDynamics* d) {
        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);
@@ -53,26 +56,29 @@ void XMLLoader::load(FGAirportDynamics* d) {
            } 
            catch (const sg_exception &e) {
            }
-       } 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) );
-                if (parkpath.exists()) {
-                    try {
-                        readXML(parkpath.str(), visitor);
-                        d->init();
+       }
+    } 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 &e) {
                 }
                 return;
-             }
-         }
+            }
+        }
     }
 }
 
@@ -112,3 +118,28 @@ void XMLLoader::load(FGRunwayPreference* p) {
     }
 }
 
+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 &e) {
+                }
+                return;
+            }
+        }
+    }
+}