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

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

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index 341bab049a1037616449d920700085603ff008ff..31e99727687037ec4a94c1c933bfeca25262d44c 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -26,42 +26,59 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include <map>
 #include <vector>
+#include STL_STRING
 
 #include "nav.hxx"
 
-FG_USING_STD(map);
-FG_USING_STD(vector);
-
+SG_USING_STD(map);
+SG_USING_STD(vector);
+SG_USING_STD(string);
 
 class FGNavList {
 
     // convenience types
-    typedef vector < FGNav > nav_list_type;
+    typedef vector < FGNav* > nav_list_type;
     typedef nav_list_type::iterator nav_list_iterator;
     typedef nav_list_type::const_iterator nav_list_const_iterator;
 
-    typedef map < int, nav_list_type, less<int> > nav_map_type;
+    typedef map < int, nav_list_type > nav_map_type;
     typedef nav_map_type::iterator nav_map_iterator;
     typedef nav_map_type::const_iterator nav_map_const_iterator;
 
+    typedef map < string, nav_list_type > nav_ident_map_type;
+       
     nav_map_type navaids;
-
+    nav_ident_map_type ident_navaids;
+       
+    // Given a point and a list of stations, return the closest one to
+    // the specified point.
+    FGNav *findNavFromList( const Point3D &aircraft, 
+                            const nav_list_type &stations );
+       
 public:
 
     FGNavList();
     ~FGNavList();
 
     // load the navaids and build the map
-    bool init( FGPath path );
+    bool init( SGPath path );
+
+    // Query the database for the specified frequency.  It is assumed
+    // that there will be multiple stations with matching frequencies
+    // so a position must be specified.  Lon and lat are in degrees,
+    // elev is in meters.
+    FGNav *findByFreq( double freq, double lon, double lat, double elev );
+
+    // locate closest item in the DB matching the requested ident
+    FGNav *findByIdent( const char* ident, const double lon, const double lat );
 
-    // query the database for the specified frequency, lon and lat are
-    // in degrees, elev is in meters
-    bool query( double lon, double lat, double elev, double freq,
-               FGNav *n, double *heading, double *dist);
+    // Given an Ident and optional freqency, return the first matching
+    // station.
+    FGNav *findByIdentAndFreq( const char* ident, const double freq = 0.0 );
 };