X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNavaids%2Ftestnavs.cxx;h=b7215e8c79e50f8a503895f49c2ec239eff216f6;hb=ad13e4f3b42c53410cb695d2dd0083af77addb2e;hp=a6b839f4443671553bef28568adc50288f08586e;hpb=8b711a5782d94a0009d49ae390cc0caa2e8348b5;p=flightgear.git

diff --git a/src/Navaids/testnavs.cxx b/src/Navaids/testnavs.cxx
index a6b839f44..b7215e8c7 100644
--- a/src/Navaids/testnavs.cxx
+++ b/src/Navaids/testnavs.cxx
@@ -11,54 +11,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;
@@ -66,9 +67,10 @@ int main() {
     // attempting to get the position relative to the OTR VOR; heading
     // should be 108 degrees, distance 74nm (according to my SimCharts
     // v1.5)
-    if ( current_fixlist->query( "DOGGA", -0.103 * SG_DEGREES_TO_RADIANS,
-                                 53.698 * SG_DEGREES_TO_RADIANS, 3000,
-				 &fix, &heading, &dist) )
+    if ( current_fixlist->query_and_offset( "DOGGA",
+                                            -0.103 * SG_DEGREES_TO_RADIANS,
+                                            53.698 * SG_DEGREES_TO_RADIANS,
+                                            3000, &fix, &heading, &dist) )
     {
 	cout << "Found a matching fix" << endl;
 	cout << " id = " << fix.get_ident() << endl;