X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Fnavlist.hxx;h=6b4b6365c1342659530617ba7d56af36b04cc20b;hb=038251e8af6ff9c24afcc08169c2bcca2c5a63c5;hp=1ae80e5b04c2b9c42766c877d5f625dc6795225f;hpb=a759908c7658562a573de86f68dd14a7cfab398c;p=flightgear.git

diff --git a/src/Navaids/navlist.hxx b/src/Navaids/navlist.hxx
index 1ae80e5b0..6b4b6365c 100644
--- a/src/Navaids/navlist.hxx
+++ b/src/Navaids/navlist.hxx
@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started April 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -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$
 
@@ -26,43 +26,102 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/fgpath.hxx>
+
+#include <simgear/structure/SGSharedPtr.hxx>
 
 #include <map>
 #include <vector>
+#include <string>
 
-#include "nav.hxx"
+#include "navrecord.hxx"
 
-FG_USING_STD(map);
-FG_USING_STD(vector);
+// forward decls
+class SGGeod;
 
+// FGNavList ------------------------------------------------------------------
 
-class FGNavList {
+typedef SGSharedPtr<FGNavRecord> nav_rec_ptr;
+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;
 
-    // convenience types
-    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 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 < int, nav_list_type, less<int> > nav_map_type;
-    typedef nav_map_type::iterator nav_map_iterator;
-    typedef nav_map_type::const_iterator nav_map_const_iterator;
+class FGNavList {
 
+    nav_list_type carrierlist;
     nav_map_type navaids;
 
+    // Given a point and a list of stations, return the closest one to
+    // the specified point.
+    FGNavRecord *findNavFromList( const SGGeod &aircraft,
+                                  const nav_list_type &stations );
+
 public:
 
     FGNavList();
     ~FGNavList();
 
-    // load the navaids and build the map
-    bool init( FGPath path );
+    // initialize the nav list
+    bool init();
+
+    // add an entry
+    bool add( FGNavRecord *n );
+
+    /** 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.
+      */
+    FGNavRecord *findByFreq( double freq, const SGGeod& position);
 
-    // 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 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 );
+
+    // 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 );
 };
 
 
+
+
+// FGTACANList ----------------------------------------------------------------
+
+
+typedef SGSharedPtr<FGTACANRecord> tacan_rec_ptr;
+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 {
+
+    tacan_list_type channellist;
+    tacan_map_type channels;
+    tacan_ident_map_type ident_channels;
+
+public:
+
+    FGTACANList();
+    ~FGTACANList();
+
+    // initialize the TACAN list
+    bool init();
+
+    // add an entry
+    bool add( FGTACANRecord *r );
+
+    // Given a TACAN Channel, return the appropriate frequency.
+    FGTACANRecord *findByChannel( const std::string& channel );
+
+
+};
 #endif // _FG_NAVLIST_HXX