bind the sky disable cutoff distance to a property

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

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index a1efefcf6251be6bbbc8ed3a82ee71b57c935689..6b4b6365c1342659530617ba7d56af36b04cc20b 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -26,9 +26,8 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/sg_path.hxx>
+
 #include <simgear/structure/SGSharedPtr.hxx>
-#include <simgear/structure/SGReferenced.hxx>
 
 #include <map>
 #include <vector>
@@ -36,37 +35,28 @@
 
 #include "navrecord.hxx"
 
-using std::map;
-using std::vector;
-using std::string;
-
-
+// forward decls
+class SGGeod;
 
 // FGNavList ------------------------------------------------------------------
 
 typedef SGSharedPtr<FGNavRecord> nav_rec_ptr;
-typedef vector < nav_rec_ptr > nav_list_type;
+typedef std::vector < nav_rec_ptr > 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 > nav_map_type;
+typedef std::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;
-typedef nav_ident_map_type::iterator nav_ident_map_iterator;
-
-
 class FGNavList {
 
     nav_list_type carrierlist;
     nav_map_type navaids;
-    nav_map_type navaids_by_tile;
-    nav_ident_map_type ident_navaids;
 
     // Given a point and a list of stations, return the closest one to
     // the specified point.
-    FGNavRecord *findNavFromList( const SGVec3d &aircraft,
+    FGNavRecord *findNavFromList( const SGGeod &aircraft,
                                   const nav_list_type &stations );
 
 public:
@@ -82,33 +72,23 @@ public:
 
     /** Query the database for the specified station.  It is assumed
       * that there will be multiple stations with matching frequencies
-      * so a position must be specified.  Lon and lat are in radians,
-      * elev is in meters.
+      * so a position must be specified.
       */
-    FGNavRecord *findByFreq( double freq, double lon, double lat, double elev );
+    FGNavRecord *findByFreq( double freq, const SGGeod& position);
 
-    // locate closest item in the DB matching the requested ident
-    FGNavRecord *findByIdent( const char* ident, const double lon, const double lat );
+    // Given an Ident and optional freqency and type , 
+    // return a list of matching stations.
+    const nav_list_type findByIdentAndFreq( const std::string& ident,
+        const double freq = 0.0, const FGPositioned::Type = FGPositioned::INVALID );
 
-    // Find items of requested type with closest exact or subsequent ident
-    // (by ASCII code value) to that supplied.
-    // Supplying true for exact forces only exact matches to be returned (similar to above function)
-    // Returns an empty list if no match found - calling function should check for this!
-    nav_list_type findFirstByIdent( const string& ident, FGPositioned::Type type, bool exact = false );
-
-    // Given an Ident and optional freqency, return the first matching
-    // station.
-    FGNavRecord *findByIdentAndFreq( const char* ident,
-                                     const double freq = 0.0 );
-
-    // returns the closest entry to the give lon/lat/elev
-    FGNavRecord *findClosest( double lon_rad, double lat_rad, double elev_m, 
-      FGPositioned::Type type = FG_NAV_ANY );
+    // Given an Ident and optional freqency and type , 
+    // return a list of matching stations sorted by distance to the given position
+    const nav_list_type findByIdentAndFreq( const SGGeod & position,
+        const std::string& ident, const double freq = 0.0, 
+        const FGPositioned::Type = FGPositioned::INVALID );
 
     // given a frequency returns the first matching entry
     FGNavRecord *findStationByFreq( double frequency );
-
-    inline const nav_map_type& get_navaids() const { return navaids; }
 };
 
 
@@ -118,10 +98,9 @@ public:
 
 
 typedef SGSharedPtr<FGTACANRecord> tacan_rec_ptr;
-typedef vector < tacan_rec_ptr > tacan_list_type;
-typedef map < int, tacan_list_type > tacan_map_type;
-typedef map < string, tacan_list_type > tacan_ident_map_type;
-
+typedef std::vector < tacan_rec_ptr > tacan_list_type;
+typedef std::map < int, tacan_list_type > tacan_map_type;
+typedef std::map < std::string, tacan_list_type > tacan_ident_map_type;
 
 class FGTACANList {
 
@@ -141,7 +120,7 @@ public:
     bool add( FGTACANRecord *r );
 
     // Given a TACAN Channel, return the appropriate frequency.
-    FGTACANRecord *findByChannel( const string& channel );
+    FGTACANRecord *findByChannel( const std::string& channel );
 
 
 };