Bug #927 - flightplan XML loading.

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

diff --git a/src/Navaids/fixlist.hxx b/src/Navaids/fixlist.hxx
index 20e7b8800e459a66f59b5942311bf89d922bc152..ce744af39e39f87cb5c63010f28131ce748a23b7 100644 (file)
--- a/src/Navaids/fixlist.hxx
+++ b/src/Navaids/fixlist.hxx
@@ -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$
 
@@ -26,45 +26,14 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/sg_path.hxx>
 
-#include <map>
-#include <vector>
-#include STL_STRING
-
-#include "fix.hxx"
-
-SG_USING_STD(map);
-SG_USING_STD(vector);
-SG_USING_STD(string);
-
-
-class FGFixList {
-
-    // typedef map < string, FGFix, less<string> > fix_map_type;
-    typedef map < string, FGFix > fix_map_type;
-    typedef fix_map_type::iterator fix_map_iterator;
-    typedef fix_map_type::const_iterator fix_map_const_iterator;
-
-    fix_map_type fixlist;
-
-public:
-
-    FGFixList();
-    ~FGFixList();
-
-    // load the navaids and build the map
-    bool init( SGPath path );
-
-    // query the database for the specified fix
-    bool query( const string& ident, FGFix *f );
-
-    // query the database for the specified fix, lon and lat are
-    // in degrees, elev is in meters
-    bool query_and_offset( const string& ident, double lon, double lat,
-                           double elev, FGFix *f, double *heading,
-                           double *dist );
-};
+class SGPath;
 
+namespace flightgear
+{
+  
+  void loadFixes(const SGPath& path);
+  
+}
 
 #endif // _FG_FIXLIST_HXX