return attribute mask as unsigned

[flightgear.git] / src / Navaids / fixlist.cxx

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index b4548a66d74cd27cd0aa1954c3c567046fe7940b..1b87d4ca8e46e76db4554590b4f3e53e2e1a1a76 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -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$
 
@@ -30,9 +30,7 @@
 #include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
-
-
-FGFixList *current_fixlist;
+SG_USING_STD(pair);
 
 
 // Constructor
@@ -47,7 +45,6 @@ FGFixList::~FGFixList( void ) {
 
 // load the navaids and build the map
 bool FGFixList::init( SGPath path ) {
-
     fixlist.erase( fixlist.begin(), fixlist.end() );
 
     sg_gzifstream in( path.str() );
@@ -80,10 +77,9 @@ bool FGFixList::init( SGPath path ) {
              << ", lat=" << fix.get_lat()
              << ", lon=" << fix.get_lon() << endl; */
 
-        fixlist[fix.get_ident()] = fix;
+        fixlist.insert(pair<string, FGFix>(fix.get_ident(), fix));
         in >> skipcomment;
     }
-    
     return true;
 }
 
@@ -91,9 +87,10 @@ bool FGFixList::init( SGPath path ) {
 // query the database for the specified fix, lon and lat are in
 // degrees, elev is in meters
 bool FGFixList::query( const string& ident, FGFix *fix ) {
-    *fix = fixlist[ident];
-    if ( ! fix->get_ident().empty() ) {
-       return true;
+    fix_map_const_iterator it = fixlist.find(ident);
+    if ( it != fixlist.end() ) {
+        *fix = it->second;
+        return true;
     } else {
         return false;
     }
@@ -106,17 +103,41 @@ bool FGFixList::query_and_offset( const string& ident, double lon, double lat,
                                   double elev, FGFix *fix, double *heading,
                                   double *dist )
 {
-    *fix = fixlist[ident];
-    if ( fix->get_ident().empty() ) {
-       return false;
+    pair<fix_map_const_iterator, fix_map_const_iterator> range = fixlist.equal_range(ident);
+
+    if (range.first == range.second) {
+        return false;
+    }
+
+    double min_s = -1.0;
+    for (fix_map_const_iterator current = range.first; current != range.second; ++current) {
+        double az1, az2, s;
+        geo_inverse_wgs_84( elev, lat, lon,
+                        current->second.get_lat(), current->second.get_lon(),
+                        &az1, &az2, &s );
+        // cout << "  dist = " << s << endl;
+        if (min_s < 0 || s < min_s) {
+            *heading = az2;
+            *dist = s;
+            min_s = s;
+            *fix = current->second;
+        }
     }
 
-    double az1, az2, s;
-    geo_inverse_wgs_84( elev, lat, lon, 
-                       fix->get_lat(), fix->get_lon(),
-                       &az1, &az2, &s );
-    // cout << "  dist = " << s << endl;
-    *heading = az2;
-    *dist = s;
     return true;
 }
+
+const FGFix* FGFixList::findFirstByIdent( const string& ident, bool exact)
+{
+    fix_map_iterator itr;
+    if(exact) {
+        itr = fixlist.find(ident);
+    } else {
+        itr = fixlist.lower_bound(ident);
+    }
+    if(itr == fixlist.end()) {
+        return(NULL);
+    } else {
+        return(&(itr->second));
+    }
+}