Moved random ground cover object management code (userdata.[ch]xx) over

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

diff --git a/src/Navaids/testnavs.cxx b/src/Navaids/testnavs.cxx
index 3e95bbcff9be88186df6f98887112c964a77b0b5..6afc189335f78da190d79d3126f7aa7f4fb0e2b9 100644 (file)
--- a/src/Navaids/testnavs.cxx
+++ b/src/Navaids/testnavs.cxx
@@ -16,25 +16,27 @@ int main() {
 
     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) )
+    FGNav *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)) {
+    FGNav *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;
     }
@@ -46,14 +48,13 @@ int main() {
     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;
     }