Added static port system and a new altimeter model connected to it.

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

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index 44ecb544690cea074bc2d379b9fb5c922dadf71b..1d6bea2c640297693f182761cfe093df38acd502 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -26,42 +26,55 @@
 
 
 #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;
+       
+    // internal helper to pick a Nav item from a nav_list based on
+    // distance from the aircraft point
+    bool findNavFromList(const Point3D &aircraft, 
+                         nav_list_iterator current,
+                         nav_list_iterator last,
+                         FGNav *n);
+       
 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, lon and lat are
     // in degrees, elev is in meters
     bool query( double lon, double lat, double elev, double freq, FGNav *n );
+
+    // locate closest item in the DB matching the requested ident
+    bool findByIdent(const char* ident, double lon, double lat, FGNav *nav);
 };