Moved some of the low level scene graph construction code over to simgear.

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

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 19de9895f8eae120a7aa3f1b63173a1f9cc84d1e..31537e1d2b3dd898cd916a14fa64f5fb93a3255c 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -21,13 +21,20 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
-#include <simgear/misc/fgstream.hxx>
-#include <simgear/math/fg_geodesy.hxx>
+#include <simgear/misc/sgstream.hxx>
+#include <simgear/math/sg_geodesy.hxx>
 
 #include "fixlist.hxx"
 
 
+FGFixList *current_fixlist;
+
+
 // Constructor
 FGFixList::FGFixList( void ) {
 }
@@ -39,14 +46,13 @@ FGFixList::~FGFixList( void ) {
 
 
 // load the navaids and build the map
-bool FGFixList::init( FGPath path ) {
-    FGFix fix;
+bool FGFixList::init( SGPath path ) {
 
     fixlist.erase( fixlist.begin(), fixlist.end() );
 
-    fg_gzifstream in( path.str() );
+    sg_gzifstream in( path.str() );
     if ( !in.is_open() ) {
-        FG_LOG( FG_GENERAL, FG_ALERT, "Cannot open file: " << path.str() );
+        SG_LOG( SG_GENERAL, SG_ALERT, "Cannot open file: " << path.str() );
         exit(-1);
     }
 
@@ -56,47 +62,51 @@ bool FGFixList::init( FGPath path ) {
     in >> skipcomment;
 
 #ifdef __MWERKS__
-
     char c = 0;
-    while ( in.get(c) && c != '\0' && fix.get_ident() != "[End]" ) {
+    while ( in.get(c) && c != '\0' ) {
         in.putback(c);
+#else  
+    while ( ! in.eof() ) {
+#endif
+
+        FGFix fix;
         in >> fix;
-       if ( fix.get_ident() != "[End]" ) {
-           fixlist[fix.get_ident()] = fix;
-       }
-        in >> skipcomment;
-    }
+        if ( fix.get_ident() == "[End]" ) {
+            break;
+        }
 
-#else
+        /* cout << "ident=" << fix.get_ident()
+             << ", lat=" << fix.get_lat()
+             << ", lon=" << fix.get_lon() << endl; */
 
-    while ( ! in.eof() && fix.get_ident() != "[End]" ) {
-        in >> fix;
-       /* cout << "id = " << n.get_ident() << endl;
-       cout << " type = " << n.get_type() << endl;
-       cout << " lon = " << n.get_lon() << endl;
-       cout << " lat = " << n.get_lat() << endl;
-       cout << " elev = " << n.get_elev() << endl;
-       cout << " freq = " << n.get_freq() << endl;
-       cout << " range = " << n.get_range() << endl; */
-       if ( fix.get_ident() != "[End]" ) {
-           fixlist[fix.get_ident()] = fix;
-       }
+        fixlist[fix.get_ident()] = fix;
         in >> skipcomment;
     }
+    
+    return true;
+}
 
-#endif
 
-    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 = fixlist[ident];
+    if ( ! fix->get_ident().empty() ) {
+       return true;
+    } else {
+        return false;
+    }
 }
 
 
-// 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_and_offset( const string& ident, double lon, double lat,
+                                  double elev, FGFix *fix, double *heading,
+                                  double *dist )
 {
     *fix = fixlist[ident];
-    if ( fix->get_ident() == "" ) {
+    if ( fix->get_ident().empty() ) {
        return false;
     }