Patch from Norman Vine:

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

diff --git a/src/Navaids/testnavs.cxx b/src/Navaids/testnavs.cxx
index dfccc4d38610702bca82f93baad52317bad9169b..920249a3aa82dc80855f0c390857eeb00d2dd6a6 100644 (file)
--- a/src/Navaids/testnavs.cxx
+++ b/src/Navaids/testnavs.cxx
@@ -1,4 +1,4 @@
-#include <simgear/misc/fgpath.hxx>
+#include <simgear/misc/sg_path.hxx>
 
 #include "fixlist.hxx"
 #include "ilslist.hxx"
@@ -8,10 +8,13 @@ int main() {
     double heading, dist;
 
     current_navlist = new FGNavList;
-    FGPath p_nav( "/home/curt/FlightGear/Navaids/default.nav" );
+    SGPath p_nav( "/home/curt/FlightGear/Navaids/default.nav" );
     current_navlist->init( p_nav );
     FGNav n;
-    if ( current_navlist->query( -93.2, 45.14, 3000, 117.30, &n) ) {
+    if ( current_navlist->query( -93.2 * SG_DEGREES_TO_RADIANS,
+                                 45.14 * SG_DEGREES_TO_RADIANS,
+                                 3000, 117.30, &n) )
+    {
        cout << "Found a vor station in range" << endl;
        cout << " id = " << n.get_ident() << endl;
     } else {
@@ -19,10 +22,13 @@ int main() {
     }
 
     current_ilslist = new FGILSList;
-    FGPath p_ils( "/home/curt/FlightGear/Navaids/default.ils" );
+    SGPath p_ils( "/home/curt/FlightGear/Navaids/default.ils" );
     current_ilslist->init( p_ils );
     FGILS i;
-    if ( current_ilslist->query( -93.1, 45.24, 3000, 110.30, &i) ) {
+    if ( current_ilslist->query( -93.1 * SG_DEGREES_TO_RADIANS,
+                                 45.24 * SG_DEGREES_TO_RADIANS,
+                                 3000, 110.30, &i) )
+    {
        cout << "Found an ils station in range" << endl;
        cout << " apt = " << i.get_aptcode() << endl;
        cout << " rwy = " << i.get_rwyno() << endl;
@@ -31,11 +37,13 @@ int main() {
     }
 
     current_fixlist = new FGFixList;
-    FGPath p_fix( "/home/curt/FlightGear/Navaids/default.fix" );
+    SGPath p_fix( "/home/curt/FlightGear/Navaids/default.fix" );
     current_fixlist->init( p_fix );
     FGFix fix;
-    if ( current_fixlist->query( "GONER", -82, 41, 3000,
-                                &fix, &heading, &dist) ) {
+    if ( current_fixlist->query( "SHELL", -82 * SG_DEGREES_TO_RADIANS,
+                                 41 * SG_DEGREES_TO_RADIANS, 3000,
+                                &fix, &heading, &dist) )
+    {
        cout << "Found a matching fix" << endl;
        cout << " id = " << fix.get_ident() << endl;
        cout << " heading = " << heading << " dist = " << dist << endl;