X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Ftestnavs.cxx;h=d38341aa7305e3f939e17fb511d0b2ee5852596a;hb=6bf47cd248ed388e6a4dd3ffa2d00977b00b62fb;hp=3e95bbcff9be88186df6f98887112c964a77b0b5;hpb=be703a92b400344740b909e5c667a8dadd2067d6;p=flightgear.git

diff --git a/src/Navaids/testnavs.cxx b/src/Navaids/testnavs.cxx
index 3e95bbcff..d38341aa7 100644
--- a/src/Navaids/testnavs.cxx
+++ b/src/Navaids/testnavs.cxx
@@ -1,3 +1,21 @@
+// Written by James Turner, started 2009.
+//
+// Copyright (C) 2009  Curtis L. Olson
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 #include <simgear/misc/sg_path.hxx>
 
 #include "fixlist.hxx"
@@ -11,54 +29,55 @@ const string FG_DATA_DIR("/usr/local/lib/FlightGear");
 int main() {
     double heading, dist;
 
-    current_navlist = new FGNavList;
+    FGNavList *current_navlist = new FGNavList;
     SGPath p_nav( FG_DATA_DIR + "/Navaids/default.nav" );
 
     current_navlist->init( p_nav );
 	
-    FGNav n;
-    if ( current_navlist->query( -93.2 * SG_DEGREES_TO_RADIANS,
-                                 45.14 * SG_DEGREES_TO_RADIANS,
-                                 3000, 117.30, &n) )
+    FGNavRecord *n;
+    if ( (n = current_navlist->findByFreq( -93.2 * SG_DEGREES_TO_RADIANS,
+                                           45.14 * SG_DEGREES_TO_RADIANS,
+                                           3000, 117.30)) != NULL )
     {
 	cout << "Found a vor station in range" << endl;
-	cout << " id = " << n.get_ident() << endl;
+	cout << " id = " << n->get_ident() << endl;
     } else {
 	cout << "not picking up vor. :-(" << endl;
     }
 
-    FGNav dcs;
-    if (current_navlist->findByIdent("DCS", -3.3 * SG_DEGREES_TO_RADIANS,
-                                     55.9 * SG_DEGREES_TO_RADIANS, &dcs)) {
+    FGNavRecord *dcs;
+    if ( (dcs = current_navlist->findByIdent( "DCS",
+                                              -3.3 * SG_DEGREES_TO_RADIANS,
+                                              55.9 * SG_DEGREES_TO_RADIANS))
+         != NULL ) {
 						
         cout << "Found DCS by ident" << endl;
-        if (dcs.get_freq() != 11520)
+        if (dcs->get_freq() != 11520)
             cout << "Frequency for DCS VOR is wrong (should be 115.20), it's " 
-                 << dcs.get_freq() << endl;
+                 << dcs->get_freq() << endl;
     } else {
         cout << "couldn't locate DCS (Dean-Cross) VOR" << endl;
     }
 	
     // we have to init the marker beacon storage before we parse the ILS file
-    current_beacons = new FGMarkerBeacons;
+    FGMarkerBeacons *current_beacons = new FGMarkerBeacons;
     current_beacons->init();
 	
-    current_ilslist = new FGILSList;
+    FGILSList *current_ilslist = new FGILSList;
     SGPath p_ils( FG_DATA_DIR + "/Navaids/default.ils" );
     current_ilslist->init( p_ils );
-    FGILS i;
-    if ( current_ilslist->query( -93.1 * SG_DEGREES_TO_RADIANS,
-                                 45.24 * SG_DEGREES_TO_RADIANS,
-                                 3000, 110.30, &i) )
-    {
+    FGILS *i = current_ilslist->findByFreq( -93.1 * SG_DEGREES_TO_RADIANS,
+                                            45.24 * SG_DEGREES_TO_RADIANS,
+                                            3000, 110.30);
+    if ( i != NULL ) {
 	cout << "Found an ils station in range" << endl;
-	cout << " apt = " << i.get_aptcode() << endl;
-	cout << " rwy = " << i.get_rwyno() << endl;
+	cout << " apt = " << i->get_aptcode() << endl;
+	cout << " rwy = " << i->get_rwyno() << endl;
     } else {
 	cout << "not picking up ils. :-(" << endl;
     }
 
-    current_fixlist = new FGFixList;
+    FGFixList *current_fixlist = new FGFixList;
     SGPath p_fix( FG_DATA_DIR + "/Navaids/default.fix" );
     current_fixlist->init( p_fix );
     FGFix fix;