Fix a couple of 64-bit warnings identified by GCC.

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

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 31537e1d2b3dd898cd916a14fa64f5fb93a3255c..2dc8806eab1dfaacb45ea7c1790c7a441b031bf6 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started April 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -16,7 +16,7 @@
 //
 // 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -25,97 +25,51 @@
 #  include <config.h>
 #endif
 
+#include <algorithm>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
+#include <Navaids/fix.hxx>
+#include <Navaids/NavDataCache.hxx>
 
-
-FGFixList *current_fixlist;
-
-
-// Constructor
-FGFixList::FGFixList( void ) {
-}
-
-
-// Destructor
-FGFixList::~FGFixList( void ) {
-}
-
-
-// load the navaids and build the map
-bool FGFixList::init( SGPath path ) {
-
-    fixlist.erase( fixlist.begin(), fixlist.end() );
-
-    sg_gzifstream in( path.str() );
-    if ( !in.is_open() ) {
-        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
-        exit(-1);
-    }
-
-    // read in each line of the file
-
-    in >> skipeol;
-    in >> skipcomment;
-
-#ifdef __MWERKS__
-    char c = 0;
-    while ( in.get(c) && c != '\0' ) {
-        in.putback(c);
-#else  
-    while ( ! in.eof() ) {
-#endif
-
-        FGFix fix;
-        in >> fix;
-        if ( fix.get_ident() == "[End]" ) {
-            break;
-        }
-
-        /* cout << "ident=" << fix.get_ident()
-             << ", lat=" << fix.get_lat()
-             << ", lon=" << fix.get_lon() << endl; */
-
-        fixlist[fix.get_ident()] = fix;
-        in >> skipcomment;
-    }
-    
-    return true;
-}
-
-
-// query the database for the specified fix, lon and lat are in
-// degrees, elev is in meters
-bool FGFixList::query( const string& ident, FGFix *fix ) {
-    *fix = fixlist[ident];
-    if ( ! fix->get_ident().empty() ) {
-       return true;
-    } else {
-        return false;
-    }
+FGFix::FGFix(PositionedID aGuid, const std::string& aIdent, const SGGeod& aPos) :
+  FGPositioned(aGuid, FIX, aIdent, aPos)
+{
 }
 
 
-// query the database for the specified fix, lon and lat are in
-// degrees, elev is in meters
-bool FGFixList::query_and_offset( const string& ident, double lon, double lat,
-                                  double elev, FGFix *fix, double *heading,
-                                  double *dist )
+namespace flightgear
 {
-    *fix = fixlist[ident];
-    if ( fix->get_ident().empty() ) {
-       return false;
-    }
+  
+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;
+  }
 
-    double az1, az2, s;
-    geo_inverse_wgs_84( elev, lat, lon, 
-                       fix->get_lat(), fix->get_lon(),
-                       &az1, &az2, &s );
-    // cout << "  dist = " << s << endl;
-    *heading = az2;
-    *dist = s;
-    return true;
 }
+  
+} // of namespace flightgear;