Merge branch 'jmt/gps'

[flightgear.git] / src / Environment / environment_ctrl.hxx

diff --git a/src/Environment/environment_ctrl.hxx b/src/Environment/environment_ctrl.hxx
index 0479d96a97893951ad09551914c48064e9daf829..aec1442cb375f56f142facb786ac5d46865d60c9 100644 (file)
--- a/src/Environment/environment_ctrl.hxx
+++ b/src/Environment/environment_ctrl.hxx
@@ -40,6 +40,7 @@
 
 // forward decls
 class SGPropertyNode;
+class SGSampleGroup;
 class FGMetar;
 
 /**
@@ -150,14 +151,15 @@ private:
        bool setup_winds_aloft;
        bool first_update;
        bool wind_interpolation_required;
-       double station_elevation_ft;
        string metar;
+       double metar_sealevel_temperature;
+       double metar_sealevel_dewpoint;
        double interpolate_prop(const char * currentname, const char * requiredname, double dvalue);
        double interpolate_val(double currentval, double requiredval, double dvalue);
-       const double EnvironmentUpdatePeriodSec;        // Seconds between interpolations
        const double MaxWindChangeKtsSec;                        // Max wind change in kts/sec
        const double MaxVisChangePercentSec;            // Max visibility change in %/sec
        const double MaxPressureChangeInHgSec;          // Max pressure change in InHg/sec
+       const double MaxTemperatureChangeDegcSec;       // Max temperature change in degc/s
        const double MaxCloudAltitudeChangeFtSec;        // Max cloud altitude change in ft/s
        const double MaxCloudThicknessChangeFtSec;      // Max cloud thickness change in ft/s
        const double MaxCloudInterpolationHeightFt; // Max distance from aircraft to
@@ -194,11 +196,14 @@ private:
        SGPropertyNode_ptr ground_elevation_n;
        SGPropertyNode_ptr longitude_n;
        SGPropertyNode_ptr latitude_n;
+       SGPropertyNode_ptr magnetic_variation_n;
 
        SGPropertyNode_ptr boundary_wind_speed_n;
        SGPropertyNode_ptr boundary_wind_from_heading_n;
        SGPropertyNode_ptr boundary_visibility_n;
        SGPropertyNode_ptr boundary_sea_level_pressure_n;
+       SGPropertyNode_ptr boundary_sea_level_temperature_n;
+       SGPropertyNode_ptr boundary_sea_level_dewpoint_n;
 private:
 
 };
@@ -248,6 +253,7 @@ private:
 
        long _stale_count;
        long _error_count;
+       bool enabled;
 };