Vivian: downgrade log levels from ALERT to INFO, tidy up the code.

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

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 31537e1d2b3dd898cd916a14fa64f5fb93a3255c..608faf02e21c6429b262e3d642cffa6a57f0cfe7 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
@@ -56,10 +56,11 @@ bool FGFixList::init( SGPath path ) {
         exit(-1);
     }
 
-    // read in each line of the file
-
+    // toss the first two lines of the file
+    in >> skipeol;
     in >> skipeol;
-    in >> skipcomment;
+
+    // read in each remaining line of the file
 
 #ifdef __MWERKS__
     char c = 0;
@@ -71,7 +72,7 @@ bool FGFixList::init( SGPath path ) {
 
         FGFix fix;
         in >> fix;
-        if ( fix.get_ident() == "[End]" ) {
+        if ( fix.get_lat() > 95.0 ) {
             break;
         }
 
@@ -119,3 +120,18 @@ bool FGFixList::query_and_offset( const string& ident, double lon, double lat,
     *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));
+    }
+}