Merge branch 'maint2' into next

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

diff --git a/src/Navaids/fixlist.hxx b/src/Navaids/fixlist.hxx
index f172e323beb243f0c0fef44b4aa5aa3433416ece..075f16d027b5296213344a327cf16ad62593ed0f 100644 (file)
--- a/src/Navaids/fixlist.hxx
+++ b/src/Navaids/fixlist.hxx
@@ -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$
 
@@ -26,39 +26,18 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
-
-#include <map>
-#include <vector>
-#include STL_STRING
-
-#include "fix.hxx"
-
-FG_USING_STD(map);
-FG_USING_STD(vector);
-FG_USING_STD(string);
 
+class FGFix;
+class SGPath;
 
 class FGFixList {
-
-    typedef map < string, FGFix, less<string> > fix_map_type;
-    typedef fix_map_type::iterator fix_map_iterator;
-    typedef fix_map_type::const_iterator fix_map_const_iterator;
-
-    fix_map_type fixlist;
-
 public:
 
     FGFixList();
     ~FGFixList();
 
     // load the navaids and build the map
-    bool init( FGPath path );
-
-    // query the database for the specified frequency, lon and lat are
-    // in degrees, elev is in meters
-    bool query( const string& ident, double lon, double lat, double elev,
-               FGFix *f, double *heading, double *dist);
+    bool init(const SGPath& path);
 };