Change from Dave Perry:

[flightgear.git] / src / Instrumentation / tacan.cxx

diff --git a/src/Instrumentation/tacan.cxx b/src/Instrumentation/tacan.cxx
index 5df347a2be3dd2ad1b8fce401dd1b11447183f2b..4a6818cc759482e84c33dd34dd6cd7ab500ed410 100755 (executable)
--- a/src/Instrumentation/tacan.cxx
+++ b/src/Instrumentation/tacan.cxx
@@ -3,6 +3,10 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/sg_random.h>
@@ -118,11 +122,9 @@ TACAN::init ()
     _time_node = node->getChild("indicated-time-min", 0, true);
     _name_node = node->getChild("name", 0, true);
     _bearing_node = node->getChild("indicated-bearing-true-deg", 0, true);
-    _carrier_lat_node = fgGetNode("/ai/models/carrier/position/latitude-deg", true);
-    _carrier_lon_node = fgGetNode("/ai/models/carrier/position/longitude-deg", true);
-
     SGPropertyNode *cnode = fgGetNode("/ai/models/carrier", num, true );
     _carrier_name_node = cnode->getChild("name", 0, true);
+    
 }
 
 void
@@ -309,8 +311,8 @@ TACAN::search (double frequency_mhz, double longitude_rad,
             unsigned int loc1= str1.find( str2, 0 );
             if ( loc1 != string::npos && str2 != "" ) {
                 SG_LOG( SG_INSTR, SG_DEBUG, " string found" );
-                _carrier_lat = _carrier_lat_node->getDoubleValue();
-                _carrier_lon = _carrier_lon_node->getDoubleValue();
+                _carrier_lat = carrier[i]->getDoubleValue("position/latitude-deg");
+                _carrier_lon = carrier[i]->getDoubleValue("position/longitude-deg");
                 _carrier_elevation_ft = carrier_tacan->get_elev_ft();
                 _carrier_range_nm = carrier_tacan->get_range();
                 _carrier_bias = carrier_tacan->get_multiuse();
@@ -324,8 +326,6 @@ TACAN::search (double frequency_mhz, double longitude_rad,
             }
         }
 
-        //_name_node->setStringValue(_transmitter_name.c_str());
-
         SG_LOG( SG_INSTR, SG_DEBUG, "name " << _carrier_name);
         SG_LOG( SG_INSTR, SG_DEBUG, "lat " << _carrier_lat << "lon " << _carrier_lon);
         SG_LOG( SG_INSTR, SG_DEBUG, "elev " << _carrier_elevation_ft);
@@ -375,7 +375,7 @@ TACAN::searchChannel (const string& _channel){
         frequency_khz = freq->get_freq();
         SG_LOG( SG_INSTR, SG_DEBUG, "freq output " << frequency_khz  );
         //check sanity
-        if (frequency_khz >9620 && frequency_khz <= 12130)
+        if (frequency_khz >=9620 && frequency_khz <= 12130)
             return frequency_khz/100;
     }
     return frequency_khz = 0;