bind the sky disable cutoff distance to a property

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

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 1b87d4ca8e46e76db4554590b4f3e53e2e1a1a76..50c06ac563c804bb99eda19862fc2921386b20ac 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -25,13 +25,22 @@
 #  include <config.h>
 #endif
 
+#include <algorithm>
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sgstream.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
-SG_USING_STD(pair);
+#include <Navaids/fix.hxx>
+#include <Airports/simple.hxx>
 
+FGFix::FGFix(const std::string& aIdent, const SGGeod& aPos) :
+  FGPositioned(FIX, aIdent, aPos)
+{
+  init(true); // init FGPositioned
+}
 
 // Constructor
 FGFixList::FGFixList( void ) {
@@ -44,9 +53,7 @@ FGFixList::~FGFixList( void ) {
 
 
 // load the navaids and build the map
-bool FGFixList::init( SGPath path ) {
-    fixlist.erase( fixlist.begin(), fixlist.end() );
-
+bool FGFixList::init(const SGPath& path ) {
     sg_gzifstream in( path.str() );
     if ( !in.is_open() ) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
@@ -58,86 +65,16 @@ bool FGFixList::init( SGPath path ) {
     in >> skipeol;
 
     // read in each remaining line of the file
-
-#ifdef __MWERKS__
-    char c = 0;
-    while ( in.get(c) && c != '\0' ) {
-        in.putback(c);
-#else  
     while ( ! in.eof() ) {
-#endif
-
-        FGFix fix;
-        in >> fix;
-        if ( fix.get_lat() > 95.0 ) {
-            break;
-        }
-
-        /* cout << "ident=" << fix.get_ident()
-             << ", lat=" << fix.get_lat()
-             << ", lon=" << fix.get_lon() << endl; */
-
-        fixlist.insert(pair<string, FGFix>(fix.get_ident(), fix));
-        in >> skipcomment;
-    }
-    return true;
-}
-
-
-// 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_map_const_iterator it = fixlist.find(ident);
-    if ( it != fixlist.end() ) {
-        *fix = it->second;
-        return true;
-    } else {
-        return false;
+      double lat, lon;
+      std::string ident;
+      in >> lat >> lon >> ident;
+      if (lat > 95) break;
+
+      // fix gets added to the FGPositioned spatial indices, so we don't need
+      // to hold onto it here.
+      new FGFix(ident, SGGeod::fromDeg(lon, lat));
+      in >> skipcomment;
     }
-}
-
-
-// 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 )
-{
-    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;
-        }
-    }
-
     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));
-    }
-}