MapWidget: make use of the new POI system and display cities on the map.

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

diff --git a/src/Navaids/navdb.cxx b/src/Navaids/navdb.cxx
index abc7975d535e4bfb675a7bcbcd34a68698e8d65c..9cc1654a974259e52e4c88d0b70cd73afd7303ff 100644 (file)
--- a/src/Navaids/navdb.cxx
+++ b/src/Navaids/navdb.cxx
@@ -40,7 +40,7 @@
 #include "navlist.hxx"
 #include <Main/globals.hxx>
 #include <Navaids/markerbeacon.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
 #include <Airports/runways.hxx>
 #include <Airports/xmlloader.hxx>
 #include <Main/fg_props.hxx>
@@ -158,16 +158,13 @@ static PositionedID readNavFromStream(std::istream& aStream,
 
   if ((type >= FGPositioned::OM) && (type <= FGPositioned::IM)) {
     AirportRunwayPair arp(cache->findAirportRunway(name));
-#if 0
-      // code is disabled since it's causing some problems, see
-      // http://code.google.com/p/flightgear-bugs/issues/detail?id=926
     if (arp.second && (elev_ft < 0.01)) {
     // snap to runway elevation
       FGPositioned* runway = cache->loadById(arp.second);
       assert(runway);
       pos.setElevationFt(runway->geod().getElevationFt());
     }
-#endif
+
     return cache->insertNavaid(type, string(), name, pos, 0, 0, 0,
                                arp.first, arp.second);
   }
@@ -186,10 +183,14 @@ static PositionedID readNavFromStream(std::istream& aStream,
     if (arp.second) {
       runway = static_cast<FGRunway*>(cache->loadById(arp.second));
       assert(runway);
+#if 0
+      // code is disabled since it's causing some problems, see
+      // http://code.google.com/p/flightgear-bugs/issues/detail?id=926
       if (elev_ft < 0.01) {
         // snap to runway elevation
         pos.setElevationFt(runway->geod().getElevationFt());
       }
+#endif
     } // of found runway in the DB
   } // of type is runway-related