Fix line endings

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

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 3fa380e4b56191107d0a85e5fecb1e923c112be2..f33665bf6bed11974b278493fbfcfa8fdf23abca 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
@@ -47,7 +47,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() );
@@ -56,10 +55,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 >> skipcomment;
+    in >> skipeol;
+
+    // read in each remaining line of the file
 
 #ifdef __MWERKS__
     char c = 0;
@@ -71,7 +71,7 @@ bool FGFixList::init( SGPath path ) {
 
         FGFix fix;
         in >> fix;
-        if ( fix.get_ident() == "[End]" ) {
+        if ( fix.get_lat() > 95.0 ) {
             break;
         }
 
@@ -82,15 +82,27 @@ bool FGFixList::init( SGPath path ) {
         fixlist[fix.get_ident()] = fix;
         in >> skipcomment;
     }
-    
     return true;
 }
 
 
-// query the database for the specified frequency, lon and lat are in
+// query the database for the specified fix, lon and lat are in
 // degrees, elev is in meters
-bool FGFixList::query( const string& ident, double lon, double lat, double elev,
-                      FGFix *fix, double *heading, double *dist )
+bool FGFixList::query( const string& ident, FGFix *fix ) {
+    *fix = fixlist[ident];
+    if ( ! fix->get_ident().empty() ) {
+       return true;
+    } else {
+        return false;
+    }
+}
+
+
+// query the database for the specified fix, lon and lat are in
+// degrees, elev is in meters
+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() ) {
@@ -106,3 +118,18 @@ bool FGFixList::query( const string& ident, double lon, double lat, double elev,
     *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));
+    }
+}