Moved some of the low level scene graph construction code over to simgear.

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

diff --git a/src/Navaids/fixlist.hxx b/src/Navaids/fixlist.hxx
index cfd61a77d81b05db0d1b13afff66dc4d549fd8b2..c23d4b75942440ae70270dd86c63054ddaaaddcc 100644 (file)
--- a/src/Navaids/fixlist.hxx
+++ b/src/Navaids/fixlist.hxx
@@ -26,7 +26,7 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <map>
 #include <vector>
@@ -34,14 +34,15 @@
 
 #include "fix.hxx"
 
-FG_USING_STD(map);
-FG_USING_STD(vector);
-FG_USING_STD(string);
+SG_USING_STD(map);
+SG_USING_STD(vector);
+SG_USING_STD(string);
 
 
 class FGFixList {
 
-    typedef map < string, FGFix, less<string> > fix_map_type;
+    // typedef map < string, FGFix, less<string> > fix_map_type;
+    typedef map < string, FGFix > fix_map_type;
     typedef fix_map_type::iterator fix_map_iterator;
     typedef fix_map_type::const_iterator fix_map_const_iterator;
 
@@ -53,12 +54,16 @@ public:
     ~FGFixList();
 
     // load the navaids and build the map
-    bool init( FGPath path );
+    bool init( SGPath path );
 
-    // query the database for the specified frequency, lon and lat are
+    // query the database for the specified fix
+    bool query( const string& ident, FGFix *f );
+
+    // query the database for the specified fix, 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 query_and_offset( const string& ident, double lon, double lat,
+                           double elev, FGFix *f, double *heading,
+                           double *dist );
 };