Fix #535: METAR from command line ignored

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

diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx
index abef848f54fa0801d1a4158f178b2762dad60323..1c99327a151c797afa031f6accd31c5ef5616868 100644 (file)
--- a/src/Environment/environment_mgr.hxx
+++ b/src/Environment/environment_mgr.hxx
@@ -16,15 +16,16 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
-// $Id$
 
 #ifndef _ENVIRONMENT_MGR_HXX
 #define _ENVIRONMENT_MGR_HXX
 
 #include <simgear/compiler.h>
 #include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/math/SGMath.hxx>
+#include <simgear/props/tiedpropertylist.hxx>
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
@@ -33,8 +34,11 @@
 #endif
 
 class FGEnvironment;
-class FGEnvironmentCtrl;
-
+class FGMetarCtrl;
+class FGMetarFetcher;
+class FGClouds;
+class FGPrecipitationMgr;
+class SGSky;
 
 /**
  * Manage environment information.
@@ -53,6 +57,7 @@ public:
 
   virtual void init ();
   virtual void reinit ();
+  virtual void shutdown ();
   virtual void bind ();
   virtual void unbind ();
   virtual void update (double dt);
@@ -69,10 +74,10 @@ public:
   virtual FGEnvironment getEnvironment (double lat, double lon,
                                        double alt) const;
 
+  virtual FGEnvironment getEnvironment(const SGGeod& aPos) const;
 private:
-
-  void _update_fdm () const;
-
+  void updateClosestAirport();
+  
   double get_cloud_layer_span_m (int index) const;
   void set_cloud_layer_span_m (int index, double span_m);
   double get_cloud_layer_elevation_ft (int index) const;
@@ -83,10 +88,23 @@ private:
   void set_cloud_layer_transition_ft (int index, double transition_ft);
   const char * get_cloud_layer_coverage (int index) const;
   void set_cloud_layer_coverage (int index, const char * coverage);
+  int get_cloud_layer_coverage_type (int index) const;
+  void set_cloud_layer_coverage_type (int index, int type );
+  double get_cloud_layer_visibility_m (int index) const;
+  void set_cloud_layer_visibility_m (int index, double visibility_m);
+  double get_cloud_layer_maxalpha (int index ) const;
+  void set_cloud_layer_maxalpha (int index, double maxalpha);
 
   FGEnvironment * _environment;        // always the same, for now
-  FGEnvironmentCtrl * _controller; // always the same, for now
-
+  FGClouds *fgClouds;
+  bool _cloudLayersDirty;
+  SGPropertyNode_ptr _altitude_n;
+  SGPropertyNode_ptr _longitude_n;
+  SGPropertyNode_ptr _latitude_n;
+  simgear::TiedPropertyList _tiedProperties;
+  SGPropertyChangeListener * _3dCloudsEnableListener;
+  SGSky* _sky;
+    
 };
 
 #endif // _ENVIRONMENT_MGR_HXX