From 9bdc9ec4e1678b75a442ff8d72df47d95d6536d6 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Sat, 11 Sep 2010 23:32:20 +0200
Subject: [PATCH] Environment: handle metar-updates-environment

And some minor fixes
---
 Environment/clouds-altitude-interpolate.xml |  1 +
 Environment/clouds-altitude-set.xml         |  1 +
 Environment/clouds-coverage.xml             |  1 +
 Environment/clouds-thickness.xml            |  1 +
 Environment/environment.xml                 |  1 +
 Environment/layer-heading-offset.xml        |  1 +
 Environment/layer-speed-change.xml          |  1 +
 Environment/metarinterpolator.xml           | 81 ++++++++++++++++++++-
 gui/dialogs/weather.xml                     |  2 +-
 9 files changed, 88 insertions(+), 2 deletions(-)

diff --git a/Environment/clouds-altitude-interpolate.xml b/Environment/clouds-altitude-interpolate.xml
index 1bcd1b1fe..e499ac79a 100644
--- a/Environment/clouds-altitude-interpolate.xml
+++ b/Environment/clouds-altitude-interpolate.xml
@@ -26,6 +26,7 @@
   <enable>
     <condition>
       <property>/environment/metar/valid</property>
+      <property>/environment/params/metar-updates-environment</property>
       <greater-than>
         <property alias="../../../../params/from"/>
         <value>-9000</value>
diff --git a/Environment/clouds-altitude-set.xml b/Environment/clouds-altitude-set.xml
index edd834a49..933020733 100644
--- a/Environment/clouds-altitude-set.xml
+++ b/Environment/clouds-altitude-set.xml
@@ -26,6 +26,7 @@
   <enable>
     <condition>
       <property>/environment/metar/valid</property>
+      <property>/environment/params/metar-updates-environment</property>
       <or>
         <less-than>
           <property alias="../../../../../params/from"/>
diff --git a/Environment/clouds-coverage.xml b/Environment/clouds-coverage.xml
index 83e2fdbbe..e1d15e000 100644
--- a/Environment/clouds-coverage.xml
+++ b/Environment/clouds-coverage.xml
@@ -26,6 +26,7 @@
   <enable>
     <condition>
       <property>/environment/metar/valid</property>
+      <property>/environment/params/metar-updates-environment</property>
       <not-equals>
         <property alias="../../../../params/from"/>
         <property alias="../../../../params/to"/>
diff --git a/Environment/clouds-thickness.xml b/Environment/clouds-thickness.xml
index 89e64573a..eae36b347 100644
--- a/Environment/clouds-thickness.xml
+++ b/Environment/clouds-thickness.xml
@@ -20,6 +20,7 @@
   <enable>
     <condition>
       <property>/environment/metar/valid</property>
+      <property>/environment/params/metar-updates-environment</property>
     </condition>
   </enable>
   <input>/environment/metar/clouds/layer[0]/thickness-ft</input>
diff --git a/Environment/environment.xml b/Environment/environment.xml
index 126805f4d..b2b6d5b5c 100644
--- a/Environment/environment.xml
+++ b/Environment/environment.xml
@@ -217,6 +217,7 @@
   <params>
    <metar-max-age-min type="long">240</metar-max-age-min> <!-- deprecated -->
    <metar-updates-environment type="bool">true</metar-updates-environment>
+   <metar-updates-winds-aloft type="bool">true</metar-updates-winds-aloft>
    <control-fdm-atmosphere type="bool">true</control-fdm-atmosphere>
    <contrail-altitude>30000</contrail-altitude>
   </params>
diff --git a/Environment/layer-heading-offset.xml b/Environment/layer-heading-offset.xml
index 363f71560..ea86d4d77 100644
--- a/Environment/layer-heading-offset.xml
+++ b/Environment/layer-heading-offset.xml
@@ -22,6 +22,7 @@
   <enable>
     <condition>
       <property>/environment/metar/valid</property>
+      <property>/environment/params/metar-updates-environment</property>
     </condition>
   </enable>
   <input>
diff --git a/Environment/layer-speed-change.xml b/Environment/layer-speed-change.xml
index 6cce732f4..586181343 100644
--- a/Environment/layer-speed-change.xml
+++ b/Environment/layer-speed-change.xml
@@ -22,6 +22,7 @@
   <enable>
     <condition>
       <property>/environment/metar/valid</property>
+      <property>/environment/params/metar-updates-environment</property>
     </condition>
   </enable>
   <input>
diff --git a/Environment/metarinterpolator.xml b/Environment/metarinterpolator.xml
index d1b28e41f..e2556e847 100644
--- a/Environment/metarinterpolator.xml
+++ b/Environment/metarinterpolator.xml
@@ -32,6 +32,7 @@
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
       </condition>
     </enable>
     <input>/environment/metar/pressure-sea-level-inhg</input>
@@ -51,6 +52,7 @@
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
       </condition>
     </enable>
     <input>/environment/metar/temperature-sea-level-degc</input>
@@ -74,6 +76,7 @@
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
       </condition>
     </enable>
     <input>/environment/metar/dewpoint-sea-level-degc</input>
@@ -88,7 +91,7 @@
 
   <filter>
     <!--
-      transfer the sea-level temperature to each layer of
+      transfer the visibility to each layer of
       interpolation controller. We are not very creative here and 
       use the same visibility for all layers but top three which
       are left untouched.
@@ -99,6 +102,7 @@
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
       </condition>
     </enable>
     <input>/environment/metar/min-visibility-m</input>
@@ -106,6 +110,9 @@
     <output>/environment/config/boundary/entry[1]/visibility-m</output>
     <output>/environment/config/aloft/entry[0]/visibility-m</output>
     <output>/environment/config/aloft/entry[1]/visibility-m</output>
+    <output>/environment/config/aloft/entry[2]/visibility-m</output>
+    <output>/environment/config/aloft/entry[3]/visibility-m</output>
+    <output>/environment/config/aloft/entry[4]/visibility-m</output>
   </filter>
 
   <!-- split the wind vector into it's components -->
@@ -117,6 +124,7 @@
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
       </condition>
     </enable>
     <input>/environment/metar/base-wind-from-north-fps</input>
@@ -130,6 +138,7 @@
     <enable>
       <condition>
         <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
       </condition>
     </enable>
     <input>/environment/metar/base-wind-from-east-fps</input>
@@ -140,30 +149,65 @@
   <!-- TODO: handle variable winds -->
   <filter include="layer-heading-offset.xml"/>
   <filter include="layer-heading-offset.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[0]/wind-heading-change-deg</offset>
     </input>
     <output>/environment/config/aloft/entry[0]/wind-from-heading-deg</output>
   </filter>
   <filter include="layer-heading-offset.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[1]/wind-heading-change-deg</offset>
     </input>
     <output>/environment/config/aloft/entry[1]/wind-from-heading-deg</output>
   </filter>
   <filter include="layer-heading-offset.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[2]/wind-heading-change-deg</offset>
     </input>
     <output>/environment/config/aloft/entry[2]/wind-from-heading-deg</output>
   </filter>
   <filter include="layer-heading-offset.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[3]/wind-heading-change-deg</offset>
     </input>
     <output>/environment/config/aloft/entry[3]/wind-from-heading-deg</output>
   </filter>
   <filter include="layer-heading-offset.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[4]/wind-heading-change-deg</offset>
     </input>
@@ -172,30 +216,65 @@
 
   <filter include="layer-speed-change.xml"/>
   <filter include="layer-speed-change.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[0]/wind-speed-change-rel</offset>
     </input>
     <output>/environment/config/aloft/entry[0]/wind-speed-kt</output>
   </filter>
   <filter include="layer-speed-change.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[1]/wind-speed-change-rel</offset>
     </input>
     <output>/environment/config/aloft/entry[1]/wind-speed-kt</output>
   </filter>
   <filter include="layer-speed-change.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[2]/wind-speed-change-rel</offset>
     </input>
     <output>/environment/config/aloft/entry[2]/wind-speed-kt</output>
   </filter>
   <filter include="layer-speed-change.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[3]/wind-speed-change-rel</offset>
     </input>
     <output>/environment/config/aloft/entry[3]/wind-speed-kt</output>
   </filter>
   <filter include="layer-speed-change.xml">
+    <enable>
+      <condition>
+        <property>/environment/metar/valid</property>
+        <property>/environment/params/metar-updates-environment</property>
+        <property>/environment/params/metar-updates-winds-aloft</property>
+      </condition>
+    </enable>
     <input>
       <offset>/environment/config/aloft/entry[4]/wind-speed-change-rel</offset>
     </input>
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 882ae1a83..5f4801644 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -999,7 +999,7 @@
         if( metar == nil ) metar = "";
         metar = normalize_string(metar);
         setprop("sim/gui/dialogs/weather-scenario/metar", metar );
-        gui.dialog_update( "weather_scenario", "metar" );
+        gui.dialog_update( "weather", "metar" );
       }, 1, 0);
 
       #initialize the METAR source selection