Merge branch 'jmt/gps'

[flightgear.git] / src / Environment / environment_mgr.cxx

diff --git a/src/Environment/environment_mgr.cxx b/src/Environment/environment_mgr.cxx
index 4542472d8881c441193b8619255c2eecc593ad96..e15ecae20370967dd2ecd978152957e805fa76d3 100644 (file)
--- a/src/Environment/environment_mgr.cxx
+++ b/src/Environment/environment_mgr.cxx
@@ -36,8 +36,8 @@
 #include <FDM/flight.hxx>
 
 #include "environment.hxx"
-#include "environment_ctrl.hxx"
 #include "environment_mgr.hxx"
+#include "environment_ctrl.hxx"
 #include "fgclouds.hxx"
 #include "precipitation_mgr.hxx"
 
@@ -50,26 +50,39 @@ FGEnvironmentMgr::FGEnvironmentMgr ()
   : _environment(new FGEnvironment)
 {
 
-   if (fgGetBool("/environment/params/real-world-weather-fetch") == true)
-       _controller = new FGMetarEnvironmentCtrl;
-   else
-       _controller = new FGInterpolateEnvironmentCtrl;
-
+  _controller = new FGInterpolateEnvironmentCtrl;
   _controller->setEnvironment(_environment);
-  set_subsystem("controller", _controller, 0.5);
-  fgClouds = new FGClouds( _controller );
+  set_subsystem("controller", _controller, 0.1 );
+
+  fgClouds = new FGClouds();
+
+  _metarcontroller = new FGMetarCtrl(_controller );
+  set_subsystem("metarcontroller", _metarcontroller, 0.1 );
+
+  _metarfetcher = new FGMetarFetcher();
+  set_subsystem("metarfetcher", _metarfetcher, 1.0 );
+
   _precipitationManager = new FGPrecipitationMgr;
   set_subsystem("precipitation", _precipitationManager);
 }
 
 FGEnvironmentMgr::~FGEnvironmentMgr ()
 {
-  delete _environment;
-  remove_subsystem("controller");
   remove_subsystem("precipitation");
-  delete _controller;
-  delete fgClouds;
   delete _precipitationManager;
+
+  remove_subsystem("metarcontroller");
+  delete _metarfetcher;
+
+  remove_subsystem("metarfetcher");
+  delete _metarcontroller;
+
+  delete fgClouds;
+
+  remove_subsystem("controller");
+  delete _controller;
+
+  delete _environment;
 }
 
 void
@@ -91,6 +104,7 @@ FGEnvironmentMgr::reinit ()
 void
 FGEnvironmentMgr::bind ()
 {
+  SGSubsystemGroup::bind();
   fgTie("/environment/visibility-m", _environment,
        &FGEnvironment::get_visibility_m, &FGEnvironment::set_visibility_m);
   fgSetArchivable("/environment/visibility-m");
@@ -145,6 +159,16 @@ FGEnvironmentMgr::bind ()
        &FGEnvironment::get_wind_from_down_fps,
        &FGEnvironment::set_wind_from_down_fps);
   fgSetArchivable("/environment/wind-from-down-fps");
+
+  fgTie("/environment/thermal-lift-fps", _environment,
+       &FGEnvironment::get_thermal_lift_fps,
+       &FGEnvironment::set_thermal_lift_fps);
+  fgSetArchivable("/environment/thermal-lift-fps");
+  fgTie("/environment/ridge-lift-fps", _environment,
+       &FGEnvironment::get_ridge_lift_fps,
+       &FGEnvironment::set_ridge_lift_fps);
+  fgSetArchivable("/environment/ridge-lift-fps");
+
   fgTie("/environment/turbulence/magnitude-norm", _environment,
         &FGEnvironment::get_turbulence_magnitude_norm,
         &FGEnvironment::set_turbulence_magnitude_norm);
@@ -182,6 +206,10 @@ FGEnvironmentMgr::bind ()
          &FGEnvironmentMgr::set_cloud_layer_coverage);
     fgSetArchivable(buf);
   }
+
+  fgTie("/environment/metar/data", _metarcontroller,
+          &FGMetarCtrl::get_metar, &FGMetarCtrl::set_metar );
+
   fgTie("/sim/rendering/clouds3d-enable", fgClouds,
          &FGClouds::get_3dClouds,
          &FGClouds::set_3dClouds);
@@ -224,6 +252,10 @@ FGEnvironmentMgr::unbind ()
   fgUntie("/environment/wind-from-north-fps");
   fgUntie("/environment/wind-from-east-fps");
   fgUntie("/environment/wind-from-down-fps");
+
+  fgUntie("/environment/thermal-lift-fps");
+  fgUntie("/environment/ridge-lift-fps");
+
   fgUntie("/environment/atmosphere/altitude-half-to-sun");
   fgUntie("/environment/atmosphere/altitude-troposphere-top");
   for (int i = 0; i < MAX_CLOUD_LAYERS; i++) {
@@ -244,8 +276,10 @@ FGEnvironmentMgr::unbind ()
   fgUntie("/sim/rendering/clouds3d-density");
   fgUntie("/sim/rendering/precipitation-enable");
   fgUntie("/environment/rebuild-layers");
+  fgUntie("/environment/weather-scenario");
   fgUntie("/sim/rendering/lightning-enable");
   fgUntie("/environment/turbulence/use-cloud-turbulence");
+  SGSubsystemGroup::unbind();
 }
 
 void