From: torsten <torsten>
Date: Sun, 20 Sep 2009 15:42:46 +0000 (+0000)
Subject: Ron Jensen:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=694cae5e91a895979b4c8f0c7119590eb1106f3e;p=flightgear.git

Ron Jensen:
While troubleshooting the new environment I discovered the metar station
elevation (station_elevation_ft) is never being set because there is a
local variable that overrides it.
---

diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx
index 008729be6..5b9cfcfb9 100644
--- a/src/Environment/environment_ctrl.cxx
+++ b/src/Environment/environment_ctrl.cxx
@@ -268,7 +268,6 @@ FGMetarCtrl::FGMetarCtrl( SGSubsystem * environmentCtrl )
 	metar_valid(false),
 	setup_winds_aloft(true),
 	wind_interpolation_required(true),
-	station_elevation_ft(0.0),
 	// Interpolation constant definitions.
 	EnvironmentUpdatePeriodSec( 0.2 ),
 	MaxWindChangeKtsSec( 0.2 ),
@@ -667,9 +666,11 @@ FGMetarCtrl::update(double dt)
 			}
 		}
 	}
-
-	set_temp_at_altitude(temperature_n->getDoubleValue(), station_elevation_ft);
-	set_dewpoint_at_altitude(dewpoint_n->getDoubleValue(), station_elevation_ft);
+	{
+		double station_elevation_ft = station_elevation_n->getDoubleValue();
+		set_temp_at_altitude(temperature_n->getDoubleValue(), station_elevation_ft);
+		set_dewpoint_at_altitude(dewpoint_n->getDoubleValue(), station_elevation_ft);
+	}
 	//TODO: check if temperature/dewpoint have changed. This requires reinit.
 
 	// Force an update of the 3D clouds
diff --git a/src/Environment/environment_ctrl.hxx b/src/Environment/environment_ctrl.hxx
index f5a5024cc..76b6aab20 100644
--- a/src/Environment/environment_ctrl.hxx
+++ b/src/Environment/environment_ctrl.hxx
@@ -150,7 +150,6 @@ private:
 	bool setup_winds_aloft;
 	bool first_update;
 	bool wind_interpolation_required;
-	double station_elevation_ft;
 	string metar;
 	double interpolate_prop(const char * currentname, const char * requiredname, double dvalue);
 	double interpolate_val(double currentval, double requiredval, double dvalue);