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

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

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 50c06ac563c804bb99eda19862fc2921386b20ac..2dc8806eab1dfaacb45ea7c1790c7a441b031bf6 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -34,47 +34,42 @@
 
 #include "fixlist.hxx"
 #include <Navaids/fix.hxx>
-#include <Airports/simple.hxx>
+#include <Navaids/NavDataCache.hxx>
 
-FGFix::FGFix(const std::string& aIdent, const SGGeod& aPos) :
-  FGPositioned(FIX, aIdent, aPos)
+FGFix::FGFix(PositionedID aGuid, const std::string& aIdent, const SGGeod& aPos) :
+  FGPositioned(aGuid, FIX, aIdent, aPos)
 {
-  init(true); // init FGPositioned
-}
-
-// Constructor
-FGFixList::FGFixList( void ) {
-}
-
-
-// Destructor
-FGFixList::~FGFixList( void ) {
 }
 
 
-// load the navaids and build the map
-bool FGFixList::init(const SGPath& path ) {
-    sg_gzifstream in( path.str() );
-    if ( !in.is_open() ) {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
-        exit(-1);
-    }
-
-    // toss the first two lines of the file
-    in >> skipeol;
-    in >> skipeol;
-
-    // read in each remaining line of the file
-    while ( ! in.eof() ) {
-      double lat, lon;
-      std::string ident;
-      in >> lat >> lon >> ident;
-      if (lat > 95) break;
+namespace flightgear
+{
+  
+void loadFixes(const SGPath& path)
+{
+  sg_gzifstream in( path.str() );
+  if ( !in.is_open() ) {
+    SG_LOG( SG_NAVAID, SG_ALERT, "Cannot open file: " << path.str() );
+    exit(-1);
+  }
+  
+  // toss the first two lines of the file
+  in >> skipeol;
+  in >> skipeol;
+  
+  NavDataCache* cache = NavDataCache::instance();
+  
+  // read in each remaining line of the file
+  while ( ! in.eof() ) {
+    double lat, lon;
+    std::string ident;
+    in >> lat >> lon >> ident;
+    if (lat > 95) break;
+    
+    cache->insertFix(ident, SGGeod::fromDeg(lon, lat));
+    in >> skipcomment;
+  }
 
-      // fix gets added to the FGPositioned spatial indices, so we don't need
-      // to hold onto it here.
-      new FGFix(ident, SGGeod::fromDeg(lon, lat));
-      in >> skipcomment;
-    }
-    return true;
 }
+  
+} // of namespace flightgear;