mbirth/pywws-page
Archived
1
0
Fork 0
Code

Use wind_kmph() instead of inline conversion for better readability.

Browse Source
This commit is contained in:
Markus Birth 2016-09-05 13:15:26 +02:00
parent 5551d5fd84
commit 0147113369
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_graph_templates/includes/hourly_wind_gust_line.xml
View File

@ -5,12 +5,12 @@
<source>hourly</source>
<subplot>
<colour>4</colour>
<ycalc>data['wind_gust'] * 3.6</ycalc>
<ycalc>wind_kmph(data['wind_gust'])</ycalc>
<title>Boe</title>
</subplot>
<subplot>
<colour>3</colour>
<ycalc>data['wind_ave'] * 3.6</ycalc>
<ycalc>wind_kmph(data['wind_ave'])</ycalc>
<title>durchschn.</title>
</subplot>
</plot>

4
_graph_templates/includes/raw_wind_gust_line.xml
View File

@ -5,12 +5,12 @@
<source>raw</source>
<subplot>
<colour>4</colour>
<ycalc>data['wind_gust'] * 3.6</ycalc>
<ycalc>wind_kmph(data['wind_gust'])</ycalc>
<title>Boe</title>
</subplot>
<subplot>
<colour>3</colour>
<ycalc>data['wind_ave'] * 3.6</ycalc>
<ycalc>wind_kmph(data['wind_ave'])</ycalc>
<title>durchschn.</title>
</subplot>
</plot>

4
_templates/24hrs.txt
View File

@ -27,12 +27,12 @@
</tr>
<tr>
<th class="right">Durchschn. Windgeschwindigkeit</th>
<td>#wind_ave "%.0f ㎞/h" "-" "x * 3.6"#</td>
<td>#wind_ave "%.0f ㎞/h" "-" "wind_kmph(x)"#</td>
<td colspan="2"></td>
</tr>
<tr>
<th class="right">Höchste Boe-Geschwindigkeit</th>
<td>#wind_gust "%.0f ㎞/h" "-" "x * 3.6"#</td>
<td>#wind_gust "%.0f ㎞/h" "-" "wind_kmph(x)"#</td>
<td>#wind_gust_t "%Y-%m-%d</td><td>%H%M %Z"#</td>
</tr>
#idx " <tr><th colspan=\"4\">&nbsp;</th></tr>" "" "[x, None][loop_count==1]"#

4
_templates/6hrs.txt
View File

@ -31,8 +31,8 @@
<td>#temp_out "%.1f ℃"#</td>
<td>#hum_out "%d%%"#</td>
<td>#wind_dir "%s" "-" "winddir_text(x)"#</td>
<td>#wind_ave "%.0f ㎞/h" "" "x * 3.6"#</td>
<td>#wind_gust "%.0f ㎞/h" "" "x * 3.6"#</td>
<td>#wind_ave "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
<td>#wind_gust "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
<td>#rain "%0.1f ㎜"#</td>
<td>#rel_pressure "%.0f ㍱"#, #pressure_trend "%s" "" "pressure_trend_text(x)"#</td>
</tr>

4
_templates/7days.txt
View File

@ -21,8 +21,8 @@
<td>#temp_out_max "%.1f ℃"#</td>
<td>#temp_out_min "%.1f ℃"#</td>
<td>#wind_dir "%s" "-" "winddir_text(x)"#</td>
<td>#wind_ave "%.0f ㎞/h" "" "x * 3.6"#</td>
<td>#wind_gust "%.0f ㎞/h" "" "x * 3.6"#</td>
<td>#wind_ave "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
<td>#wind_gust "%.0f ㎞/h" "" "wind_kmph(x)"#</td>
<td>#rain "%0.1f ㎜"#</td>
</tr>
#jump 1#

4
_templates/feed_daily.xml
View File

@ -17,8 +17,8 @@
<description>Temperatur: #temp_out_min "%.1f℃ (min)"#
#temp_out_max ", %.1f℃ (max)"#
, Wind: #wind_dir "%s, " "" "winddir_text(x)"#
#wind_ave "%.0f ㎞/h (durchschn.), " "" "x * 3.6"#
#wind_gust "%.0f ㎞/h (max.), " "" "x * 3.6"#
#wind_ave "%.0f ㎞/h (durchschn.), " "" "wind_kmph(x)"#
#wind_gust "%.0f ㎞/h (max.), " "" "wind_kmph(x)"#
Regenfall #rain "%.1f ㎜"#</description>
<guid isPermaLink="false">#idx "daily_%Y_%m_%d"#</guid>
<pubDate>#idx "%a, %d %b %Y %H:%M:%S %z"#</pubDate>

4
_templates/feed_hourly.xml
View File

@ -15,8 +15,8 @@
<link>http://fks.birth-online.de/</link>
<description>Temperatur: #temp_out "%.1f℃" "-"#
, Wind: #wind_dir "%s, " "" "winddir_text(x)"#
#wind_ave "%.0f ㎞/h (durchschn.), " "" "x * 3.6"#
#wind_gust "%.0f ㎞/h (max.)" "" "x * 3.6"#
#wind_ave "%.0f ㎞/h (durchschn.), " "" "wind_kmph(x)"#
#wind_gust "%.0f ㎞/h (max.)" "" "wind_kmph(x)"#
, Luftfeuchte: #hum_out "%d%%"#
, Regenfall (stündl.) #rain "%.1f ㎜"#
, Luftdruck: #rel_pressure "%.0f ㍱, "#

4
_templates/json_raw.txt
View File

@ -3,7 +3,7 @@
[
[ "timestamp", "temp_out_c", "hum_out_p", "wind_dir", "wind_ave_kmh", "wind_gust_kmh", "rain_mm", "abs_pressure_hpa" ]
#loop 26298#
,[#idx#,#temp_out "%.1f"#,#hum_out "%d"#,#wind_dir "%0d" "99"#,#wind_ave "%.0f" "" "x * 3.6"#,#wind_gust "%.0f" "" "x * 3.6"#,#rain "%0.1f"#,#abs_pressure "%.0f"#]
,[#idx#,#temp_out "%.1f"#,#hum_out "%d"#,#wind_dir "%0d" "99"#,#wind_ave "%.0f" "" "wind_kmph(x)"#,#wind_gust "%.0f" "" "wind_kmph(x)"#,#rain "%0.1f"#,#abs_pressure "%.0f"#]
#jump -1#
#endloop#
]
]

4
_templates/tweet.txt
View File

@ -4,8 +4,8 @@ media /opt/pywws/localout/tweet.png
#roundtime True#
#idx "%H:%M %Z:"# 🌡#temp_out "%.1f℃" "-"#
, 🌀 #wind_dir "%s, " "" "winddir_text(x)"#
#wind_ave "Ø %.0f ㎞/h, " "" "x * 3.6"#
#wind_gust "🔝 %.0f ㎞/h" "" "x * 3.6"#
#wind_ave "Ø %.0f ㎞/h, " "" "wind_kmph(x)"#
#wind_gust "🔝 %.0f ㎞/h" "" "wind_kmph(x)"#
, Luftfeuchte: #hum_out "%d%%"#
, 💧 (stdl.) #rain "%.1f㎜"#
, Druck: #rel_pressure "%.0f ㍱, "#