X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Fmarker_beacon.cxx;h=2037211bbf8e69a24d742ec3e99a9b9e4430d430;hb=43880b201cea2b120fefd99696ae0b43227358dc;hp=9d8022efe070b83c28d68e281342d1cdece52a93;hpb=bb2b03c7e392e107aeaf7dbc4eecc59064b28512;p=flightgear.git

diff --git a/src/Instrumentation/marker_beacon.cxx b/src/Instrumentation/marker_beacon.cxx
index 9d8022efe..2037211bb 100644
--- a/src/Instrumentation/marker_beacon.cxx
+++ b/src/Instrumentation/marker_beacon.cxx
@@ -29,6 +29,7 @@
 
 #include <simgear/compiler.h>
 #include <simgear/math/sg_random.h>
+#include <simgear/misc/sg_path.hxx>
 
 #include <Aircraft/aircraft.hxx>
 #include <Navaids/navlist.hxx>
@@ -62,8 +63,7 @@ FGMarkerBeacon::FGMarkerBeacon(SGPropertyNode *node) :
     low_tbl = new SGInterpTable( low.str() );
     high_tbl = new SGInterpTable( high.str() );
 
-    int i;
-    for ( i = 0; i < node->nChildren(); ++i ) {
+    for ( int i = 0; i < node->nChildren(); ++i ) {
         SGPropertyNode *child = node->getChild(i);
         string cname = child->getName();
         string cval = child->getStringValue();
@@ -109,9 +109,12 @@ FGMarkerBeacon::init ()
     audio_vol = node->getChild("volume", 0, true);
     serviceable = node->getChild("serviceable", 0, true);
 
-    power_btn->setBoolValue( true );
-    audio_btn->setBoolValue( true );
-    serviceable->setBoolValue( true );
+    if (power_btn->getType() == SGPropertyNode::NONE)
+        power_btn->setBoolValue( true );
+    if (audio_btn->getType() == SGPropertyNode::NONE)
+        audio_btn->setBoolValue( true );
+    if (serviceable->getType() == SGPropertyNode::NONE)
+        serviceable->setBoolValue( true );
 
     morse.init();
     beacon.init();
@@ -156,14 +159,20 @@ FGMarkerBeacon::update(double dt)
 {
     need_update = false;
 
+    // On timeout, scan again, this needs to run every iteration no
+    // matter what the power or serviceable state.  If power is turned
+    // off or the unit becomes unserviceable while a beacon sound is
+    // playing, the search() routine still needs to be called so the
+    // sound effect can be properly disabled.
+
+    _time_before_search_sec -= dt;
+    if ( _time_before_search_sec < 0 ) {
+        search();
+    }
+
     if ( has_power() && serviceable->getBoolValue()
             && !sound_pause->getBoolValue()) {
 
-        // On timeout, scan again
-        _time_before_search_sec -= dt;
-        if ( _time_before_search_sec < 0 ) {
-            search();
-        }
         // marker beacon blinking
         bool light_on = ( outer_blink || middle_blink || inner_blink );
         SGTimeStamp current;
@@ -204,20 +213,20 @@ FGMarkerBeacon::update(double dt)
 
 
 static bool check_beacon_range( const SGGeod& pos,
-                                FGNavRecord *b )
+                                FGPositioned *b )
 {
-    double d = distSqr(b->get_cart(), SGVec3d::fromGeod(pos));
+    double d = distSqr(b->cart(), SGVec3d::fromGeod(pos));
     // cout << "  distance = " << d << " ("
     //      << FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER
     //         * FG_ILS_DEFAULT_RANGE * SG_NM_TO_METER
     //      << ")" << endl;
 
-    // cout << "  range = " << sqrt(d) << endl;
+    //std::cout << "  range = " << sqrt(d) << std::endl;
 
     // cout << "elev = " << elev * SG_METER_TO_FEET
     //      << " current->get_elev() = " << current->get_elev() << endl;
     double elev_ft = pos.getElevationFt();
-    double delev = elev_ft - b->get_elev_ft();
+    double delev = elev_ft - b->elevation();
 
     // max range is the area under r = 2.4 * alt or r^2 = 4000^2 - alt^2
     // whichever is smaller.  The intersection point is 1538 ...
@@ -230,7 +239,7 @@ static bool check_beacon_range( const SGGeod& pos,
         maxrange2 = 0.0;
     }
     maxrange2 *= SG_FEET_TO_METER * SG_FEET_TO_METER; // convert to meter^2
-    // cout << "delev = " << delev << " maxrange = " << maxrange << endl;
+    //std::cout << "delev = " << delev << " maxrange = " << sqrt(maxrange2) << std::endl;
 
     // match up to twice the published range so we can model
     // reduced signal strength
@@ -241,10 +250,22 @@ static bool check_beacon_range( const SGGeod& pos,
     }
 }
 
+class BeaconFilter : public FGPositioned::Filter
+{
+public:
+  virtual FGPositioned::Type minType() const {
+    return FGPositioned::OM;
+  }
+
+  virtual FGPositioned::Type maxType()  const {
+    return FGPositioned::IM;
+  }
+
+};
+
 // Update current nav/adf radio stations based on current postition
 void FGMarkerBeacon::search()
 {
-
     // reset search time
     _time_before_search_sec = 1.0;
 
@@ -258,13 +279,9 @@ void FGMarkerBeacon::search()
     // Beacons.
     ////////////////////////////////////////////////////////////////////////
 
-    // get closest marker beacon
-    FGNavRecord *b
-      = globals->get_mkrlist()->findClosest( pos.getLongitudeRad(),
-                                             pos.getLatitudeRad(),
-                                             pos.getElevationM() );
-
-    // cout << "marker beacon = " << b << " (" << b->get_type() << ")" << endl;
+    // get closest marker beacon - within a 1nm cutoff
+    BeaconFilter filter;
+    FGPositionedRef b = FGPositioned::findClosest(pos, 1.0, &filter);
 
     fgMkrBeacType beacon_type = NOBEACON;
     bool inrange = false;
@@ -276,8 +293,7 @@ void FGMarkerBeacon::search()
         } else if ( b->type() == FGPositioned::IM ) {
             beacon_type = INNER;
         }
-        inrange = check_beacon_range( pos, b );
-        // cout << "  inrange = " << inrange << endl;
+        inrange = check_beacon_range( pos, b.ptr() );
     }
 
     outer_marker = middle_marker = inner_marker = false;