Fix a compile problem for lower_bound()

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

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index aa9970026d3d6ffdade1c87071b872e51c8f1dd3..b975f95b0e9b197c229f605b4a39fdd4b1ee45f2 100644 (file)
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -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$
 
@@ -27,45 +27,48 @@
 
 #include <simgear/compiler.h>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/structure/SGSharedPtr.hxx>
+#include <simgear/structure/SGReferenced.hxx>
 
 #include <map>
 #include <vector>
-#include STL_STRING
+#include <string>
 
 #include "navrecord.hxx"
 
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(string);
+using std::map;
+using std::vector;
+using std::string;
 
 
-// convenience types
-typedef vector < FGNavRecord* > nav_list_type;
-typedef vector < FGTACANRecord* > tacan_list_type;
+
+// FGNavList ------------------------------------------------------------------
+
+typedef SGSharedPtr<FGNavRecord> nav_rec_ptr;
+typedef 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 map < int, tacan_list_type > tacan_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 map < string, tacan_list_type > tacan_ident_map_type;
+typedef nav_ident_map_type::iterator nav_ident_map_iterator;
+
 
 class FGNavList {
 
-    nav_list_type navlist;
     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 Point3D &aircraft, 
+    FGNavRecord *findNavFromList( const SGVec3d &aircraft,
                                   const nav_list_type &stations );
-       
+
 public:
 
     FGNavList();
@@ -76,50 +79,55 @@ public:
 
     // add an entry
     bool add( FGNavRecord *n );
-    //bool add( FGTACANRecord *r );
 
-    // 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.
+    /** 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.
+      */
     FGNavRecord *findByFreq( double freq, double lon, double lat, double elev );
 
-    // 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.
-    FGNavRecord *findByLoc( double lon, double lat, double elev );
-
     // locate closest item in the DB matching the requested ident
     FGNavRecord *findByIdent( const char* ident, const double lon, const double lat );
 
+    // 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, fg_nav_types 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 );
+    FGNavRecord *findClosest( double lon_rad, double lat_rad, double elev_m, fg_nav_types type = FG_NAV_ANY );
 
     // given a frequency returns the first matching entry
     FGNavRecord *findStationByFreq( double frequency );
 
-    inline nav_map_type get_navaids() const { return navaids; }
+    inline const nav_map_type& get_navaids() const { return navaids; }
 };
 
+
+
+
+// FGTACANList ----------------------------------------------------------------
+
+
+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;
+
+
 class FGTACANList {
 
     tacan_list_type channellist;
-    //nav_list_type carrierlist;
     tacan_map_type channels;
-    //nav_map_type navaids_by_tile;
     tacan_ident_map_type ident_channels;
-       
-    // Given a point and a list of stations, return the closest one to
-    // the specified point.
-    /*FGNavRecord *findNavFromList( const Point3D &aircraft, 
-                                  const nav_list_type &stations );*/
-       
+
 public:
 
     FGTACANList();
@@ -129,12 +137,11 @@ public:
     bool init();
 
     // add an entry
-    
     bool add( FGTACANRecord *r );
-    
-    // Given a TACAN Channel, return the appropriate frequency.  
-    FGTACANRecord *findByChannel( string channel );
 
-    
+    // Given a TACAN Channel, return the appropriate frequency.
+    FGTACANRecord *findByChannel( const string& channel );
+
+
 };
 #endif // _FG_NAVLIST_HXX