Change nav->get_elev() to nav->get_elev_ft() to convey the actual units

explicitely.  This value has always been feet, but there were a couple places
in the code that assumed this elevation was meters.  The result was that you
could park directly over the top of the Black Forest VOR (112.50) NE of KCOS
and get a dme reading of 2.5 or so.  This problem is now resolved.

diff --git a/src/Instrumentation/adf.cxx b/src/Instrumentation/adf.cxx
index 0ecda901c71b47092d4ee7ff04bf2139bd1a8dde..bdc051e66b0f989223c92fedf3634eb07362bec1 100644 (file)
--- a/src/Instrumentation/adf.cxx
+++ b/src/Instrumentation/adf.cxx
@@ -174,7 +174,7 @@ ADF::search (double frequency_khz, double longitude_rad,
             _transmitter_lon_deg = nav->get_lon();
             _transmitter_lat_deg = nav->get_lat();
             _transmitter = Point3D(nav->get_x(), nav->get_y(), nav->get_z());
-            _transmitter_elevation_ft = nav->get_elev() * SG_METER_TO_FEET;
+            _transmitter_elevation_ft = nav->get_elev_ft();
             _transmitter_range_nm = nav->get_range();
         }
     } else {

diff --git a/src/Instrumentation/dme.cxx b/src/Instrumentation/dme.cxx
index 2bd93b3e46480664abbfda4830a23c4f396573e1..d474e976dc6d8132c8429ebc0aa35d348a70fe3e 100644 (file)
--- a/src/Instrumentation/dme.cxx
+++ b/src/Instrumentation/dme.cxx
@@ -173,7 +173,7 @@ DME::search (double frequency_mhz, double longitude_rad,
         _transmitter = Point3D(nav->get_x(),
                                nav->get_y(),
                                nav->get_z());
-        _transmitter_elevation_ft = nav->get_elev() * SG_METER_TO_FEET;
+        _transmitter_elevation_ft = nav->get_elev_ft();
         _transmitter_range_nm = nav->get_range(); // fixme
         return;
     }