This should apply, and everything should build cleanly, in isolation from the

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

diff --git a/src/Airports/apt_loader.cxx b/src/Airports/apt_loader.cxx
index 0c62ea31dd214f50a3f9a52e816441a0c6fbb412..896be4ea1b4b737cad102182d3dc698e1f89c688 100644 (file)
--- a/src/Airports/apt_loader.cxx
+++ b/src/Airports/apt_loader.cxx
@@ -37,13 +37,41 @@
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/strutils.hxx>
 
-#include STL_STRING
+#include <string>
 
 #include "simple.hxx"
 #include "runways.hxx"
 
 #include "apt_loader.hxx"
 
+static void addAirport(FGAirportList *airports, const string& apt_id, const string& apt_name,
+    int rwy_count, double rwy_lat_accum, double rwy_lon_accum, double last_rwy_heading,
+    double apt_elev, SGGeod& tower, bool got_tower, int type)
+{
+    if (apt_id.empty())
+        return;
+
+    if (!rwy_count) {
+        SG_LOG(SG_GENERAL, SG_ALERT, "ERROR: No runways for " << apt_id
+                << ", skipping." );
+        return;
+    }
+
+    double lat = rwy_lat_accum / (double)rwy_count;
+    double lon = rwy_lon_accum / (double)rwy_count;
+
+    if (!got_tower) {
+        // tower height hard coded for now...
+        const float tower_height = 50.0f;
+        // make a little off the heading for 1 runway airports...
+        float fudge_lon = fabs(sin(last_rwy_heading * SGD_DEGREES_TO_RADIANS)) * .003f;
+        float fudge_lat = .003f - fudge_lon;
+        tower = SGGeod::fromDegFt(lon + fudge_lon, lat + fudge_lat, apt_elev + tower_height);
+    }
+
+    airports->add(apt_id, SGGeod::fromDegFt(lon, lat, apt_elev), tower, apt_name, false,
+            type == 1/*airport*/, type == 16/*seaport*/, type == 17/*heliport*/);
+}
 
 // Load the airport data base from the specified aptdb file.  The
 // metar file is used to mark the airports as having metar available
@@ -66,7 +94,9 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
     double last_apt_elev = 0.0;
     string last_apt_name = "";
     string last_apt_info = "";
-    string last_apt_type = "";
+    int last_apt_type = 0;
+    SGGeod last_tower;
+    bool got_tower = false;
     string line;
     char tmp[2049];
     tmp[2048] = 0;
@@ -76,6 +106,7 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
     double rwy_lon_accum = 0.0;
     double rwy_lat_accum = 0.0;
     int rwy_count = 0;
+    double last_rwy_heading = 0.0;
 
     while ( ! in.eof() ) {
        in.getline(tmp, 2048);
@@ -119,24 +150,13 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
             SG_LOG( SG_GENERAL, SG_BULK, "Next airport = " << id << " "
                     << elev );
 
-            if ( !last_apt_id.empty()) {
-                if ( rwy_count > 0 ) {
-                    double lat = rwy_lat_accum / (double)rwy_count;
-                    double lon = rwy_lon_accum / (double)rwy_count;
-                    airports->add( last_apt_id, lon, lat, last_apt_elev,
-                                   last_apt_name, false );
-               } else {
-                   if ( !last_apt_id.length() ) {
-                       SG_LOG(SG_GENERAL, SG_ALERT,
-                               "ERROR: No runways for " << last_apt_id
-                               << " skipping." );
-                   }
-               }
-            }
+            addAirport(airports, last_apt_id, last_apt_name, rwy_count, rwy_lat_accum, rwy_lon_accum,
+                last_rwy_heading, last_apt_elev, last_tower, got_tower, last_apt_type);
 
             last_apt_id = id;
-            last_apt_elev = atof( token[1].c_str() );
+            last_apt_elev = elev;
             last_apt_name = "";
+            got_tower = false;
 
             // build the name
             for ( unsigned int i = 5; i < token.size() - 1; ++i ) {
@@ -146,7 +166,7 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
             last_apt_name += token[token.size() - 1];
 
             last_apt_info = line;
-            last_apt_type = token[0];
+            last_apt_type = atoi( token[0].c_str() );
 
             // clear runway list for start of next airport
             rwy_lon_accum = 0.0;
@@ -168,6 +188,8 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
             double heading = atof( token[4].c_str() );
             double length = atoi( token[5].c_str() );
             double width = atoi( token[8].c_str() );
+            
+            last_rwy_heading = heading;
 
             string rwy_displ_threshold = token[6];
             vector<string> displ
@@ -196,11 +218,21 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
         } else if ( line_id == 18 ) {
             // beacon entry (ignore)
         } else if ( line_id == 14 ) {
-            // control tower entry (ignore)
+            // control tower entry
+            token.clear();
+            token = simgear::strutils::split(line);
+
+            double lat = atof( token[1].c_str() );
+            double lon = atof( token[2].c_str() );
+            double elev = atof( token[3].c_str() );
+            last_tower = SGGeod::fromDegFt(lon, lat, elev);
+            got_tower = true;
         } else if ( line_id == 19 ) {
             // windsock entry (ignore)
         } else if ( line_id == 15 ) {
             // custom startup locations (ignore)
+        } else if ( line_id == 0 ) {
+            // ??
         } else if ( line_id >= 50 && line_id <= 56 ) {
             // frequency entries (ignore)
         } else if ( line_id == 99 ) {
@@ -212,20 +244,10 @@ bool fgAirportDBLoad( FGAirportList *airports, FGRunwayList *runways,
         }
     }
 
-    if ( !last_apt_id.empty()) {
-        if ( rwy_count > 0 ) {
-            double lat = rwy_lat_accum / (double)rwy_count;
-            double lon = rwy_lon_accum / (double)rwy_count;
-            airports->add( last_apt_id, lon, lat, last_apt_elev,
-                           last_apt_name, false );
-        } else {
-            if ( !last_apt_id.length() ) {
-                SG_LOG(SG_GENERAL, SG_ALERT,
-                       "ERROR: No runways for " << last_apt_id
-                       << " skipping." );
-            }
-        }
-    }
+    // add the last airport being processed if any
+    addAirport(airports, last_apt_id, last_apt_name, rwy_count, rwy_lat_accum, rwy_lon_accum,
+        last_rwy_heading, last_apt_elev, last_tower, got_tower, 0);
+
 
     //
     // Load the metar.dat file and update apt db with stations that