Fix turn entry path position computation.

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

diff --git a/src/Navaids/navdb.hxx b/src/Navaids/navdb.hxx
index 3c2321221261e57c58f0cb17a797f85493c9a5f4..0036a402f93f2db57b71151acb0ba4259248eb23 100644 (file)
--- a/src/Navaids/navdb.hxx
+++ b/src/Navaids/navdb.hxx
@@ -26,33 +26,24 @@
 
 
 #include <simgear/compiler.h>
-#include <simgear/misc/sg_path.hxx>
-
-// #include <map>
-// #include <vector>
-// #include <string>
-
-#include "navlist.hxx"
-#include "fixlist.hxx"
-
-// using std::map;
-// using std::vector;
-// using std::string;
+#include <string>
 
+// forward decls
+class FGTACANList;
+class SGPath;
+class SGPropertyNode;
+class FGRunway;
 
+namespace flightgear
+{
+  
 // load and initialize the navigational databases
-bool fgNavDBInit( FGAirportList *airports,
-                  FGNavList *navlist, FGNavList *loclist, FGNavList *gslist,
-                  FGNavList *dmelist, FGNavList *mkrbeacons,
-                  FGNavList *tacanlist, FGNavList *carrierlist,
-                  FGTACANList *channellist );
-
-// This routines traverses the localizer list and attempts to match
-// each entry with it's corresponding runway.  When it is successful,
-// it then "moves" the localizer and updates it's heading so it
-// *perfectly* aligns with the runway, but is still the same distance
-// from the runway threshold.
-void fgNavDBAlignLOCwithRunway( FGAirportList *airport, FGNavList *loclist,
-                                double threshold );
-
+bool navDBInit(const SGPath& path);
+  
+bool loadCarrierNav(const SGPath& path);
+  
+bool loadTacan(const SGPath& path, FGTACANList *channellist);
+
+} // of namespace flightgear
+  
 #endif // _FG_NAVDB_HXX