Some minor changes preparing for the weather update
- Use aloft altitudes to match common forecast maps - Simplify the metar interpolator rules
This commit is contained in:
Torsten Dreyer
parent
39c4e7a615
commit
e66aacf417
2 changed files with 11 additions and 84 deletions
|
|
@ -113,7 +113,7 @@
|
|||
<aloft>
|
||||
|
||||
<entry>
|
||||
<elevation-ft>3000</elevation-ft>
|
||||
<elevation-ft>5000</elevation-ft>
|
||||
<wind-from-heading-deg>300</wind-from-heading-deg>
|
||||
<wind-speed-kt>10</wind-speed-kt>
|
||||
<visibility-m>16093.44</visibility-m>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
</entry>
|
||||
|
||||
<entry>
|
||||
<elevation-ft>6000</elevation-ft>
|
||||
<elevation-ft>10000</elevation-ft>
|
||||
<wind-from-heading-deg>310</wind-from-heading-deg>
|
||||
<wind-speed-kt>20</wind-speed-kt>
|
||||
<turbulence>
|
||||
|
|
@ -141,7 +141,7 @@
|
|||
</entry>
|
||||
|
||||
<entry>
|
||||
<elevation-ft>9000</elevation-ft>
|
||||
<elevation-ft>18000</elevation-ft>
|
||||
<wind-from-heading-deg>320</wind-from-heading-deg>
|
||||
<wind-speed-kt>30</wind-speed-kt>
|
||||
<wind-heading-change-deg>35</wind-heading-change-deg>
|
||||
|
|
@ -149,7 +149,7 @@
|
|||
</entry>
|
||||
|
||||
<entry>
|
||||
<elevation-ft>30000</elevation-ft>
|
||||
<elevation-ft>24000</elevation-ft>
|
||||
<wind-from-heading-deg>330</wind-from-heading-deg>
|
||||
<wind-speed-kt>50</wind-speed-kt>
|
||||
<wind-heading-change-deg>35</wind-heading-change-deg>
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
</entry>
|
||||
|
||||
<entry>
|
||||
<elevation-ft>40000</elevation-ft>
|
||||
<elevation-ft>30000</elevation-ft>
|
||||
<wind-from-heading-deg>340</wind-from-heading-deg>
|
||||
<wind-speed-kt>70</wind-speed-kt>
|
||||
<wind-heading-change-deg>35</wind-heading-change-deg>
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@
|
|||
<!-- split the wind vector into it's components -->
|
||||
|
||||
<filter>
|
||||
<name>MetarController:wind-from-north-kt</name>
|
||||
<name>MetarController:wind-from-north-fps</name>
|
||||
<type>exponential</type>
|
||||
<filter-time>30</filter-time>
|
||||
<enable>
|
||||
|
|
@ -119,22 +119,12 @@
|
|||
<property>/environment/metar/valid</property>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<expression>
|
||||
<cos>
|
||||
<product>
|
||||
<property>/environment/metar/base-wind-dir-deg</property>
|
||||
<value>0.0174533</value>
|
||||
</product>
|
||||
</cos>
|
||||
</expression>
|
||||
<scale>/environment/metar/base-wind-speed-kt</scale>
|
||||
</input>
|
||||
<output>/environment/metar/base-wind-from-north-kt</output>
|
||||
<input>/environment/metar/base-wind-from-north-fps</input>
|
||||
<output>/environment/config/boundary/entry[0]/wind-from-north-fps</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>MetarController:wind-from-east-kt</name>
|
||||
<name>MetarController:wind-from-east-fps</name>
|
||||
<type>exponential</type>
|
||||
<filter-time>30</filter-time>
|
||||
<enable>
|
||||
|
|
@ -142,71 +132,8 @@
|
|||
<property>/environment/metar/valid</property>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<expression>
|
||||
<sin>
|
||||
<product>
|
||||
<property>/environment/metar/base-wind-dir-deg</property>
|
||||
<value>0.0174533</value>
|
||||
</product>
|
||||
</sin>
|
||||
</expression>
|
||||
<scale>/environment/metar/base-wind-speed-kt</scale>
|
||||
</input>
|
||||
<output>/environment/metar/base-wind-from-east-kt</output>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>MetarController::wind-speed-kt</name>
|
||||
<enable>
|
||||
<condition>
|
||||
<property>/environment/metar/valid</property>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<expression>
|
||||
<!-- pythagoras in markup language -->
|
||||
<sqrt>
|
||||
<sum>
|
||||
<product>
|
||||
<property>/environment/metar/base-wind-from-east-kt</property>
|
||||
<property>/environment/metar/base-wind-from-east-kt</property>
|
||||
</product>
|
||||
<product>
|
||||
<property>/environment/metar/base-wind-from-north-kt</property>
|
||||
<property>/environment/metar/base-wind-from-north-kt</property>
|
||||
</product>
|
||||
</sum>
|
||||
</sqrt>
|
||||
</expression>
|
||||
</input>
|
||||
<output>/environment/config/boundary/entry[0]/wind-speed-kt</output>
|
||||
<type>gain</type>
|
||||
<gain>1.0</gain>
|
||||
</filter>
|
||||
|
||||
<filter>
|
||||
<name>MetarController:wind-from-heading-deg</name>
|
||||
<enable>
|
||||
<condition>
|
||||
<property>/environment/metar/valid</property>
|
||||
</condition>
|
||||
</enable>
|
||||
<input>
|
||||
<expression>
|
||||
<atan2>
|
||||
<property>/environment/metar/base-wind-from-east-kt</property>
|
||||
<property>/environment/metar/base-wind-from-north-kt</property>
|
||||
</atan2>
|
||||
</expression>
|
||||
</input>
|
||||
<output>/environment/config/boundary/entry[0]/wind-from-heading-deg</output>
|
||||
<type>gain</type>
|
||||
<gain>57.3</gain> <!-- radians to degree -->
|
||||
<period>
|
||||
<min>0</min>
|
||||
<max>360</max>
|
||||
</period>
|
||||
<input>/environment/metar/base-wind-from-east-fps</input>
|
||||
<output>/environment/config/boundary/entry[0]/wind-from-east-fps</output>
|
||||
</filter>
|
||||
|
||||
<!-- Adjust the wind-vector for the layers -->
|
||||
|
|
|
|||
Loading…
Reference in a new issue