# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1506601476 -10800
# Node ID d4f4a9dfb34f4f81539387eb8761e76ffb06511d
# Parent  ac3b79eca0ca135ee9695a903f6062d1b058ba7b
weather: No longer use named keys for measurement data that is not common for all measurement station types.

diff -r ac3b79eca0ca -r d4f4a9dfb34f config.weather.example
--- a/config.weather.example	Thu Sep 28 15:22:03 2017 +0300
+++ b/config.weather.example	Thu Sep 28 15:24:36 2017 +0300
@@ -39,12 +39,11 @@
 
 
 set weather_msg_result [list "\002@station@\002, mitattu klo @ctime@: \002@temp@°C\002"]
-lappend weather_msg_result ", @weather1@"
-lappend weather_msg_result ", keli @weather2@"
-lappend weather_msg_result ", tien pinta @road_temp@°C"
+lappend weather_msg_result ", tien pinta @rv_10@°C"
 lappend weather_msg_result ", kosteus \002@humidity@%\002"
 lappend weather_msg_result ", tuuli \002@wind_speed@\002 m/s"
-lappend weather_msg_result ", pilvipeite \002@cloud_cover@\002"
+lappend weather_msg_result ", pilvipeite \002@rv_9@\002"
+lappend weather_msg_result ", näkyvyys \002@rv_12@ km\002"
 lappend weather_msg_result "."
 
 
diff -r ac3b79eca0ca -r d4f4a9dfb34f weather.tcl
--- a/weather.tcl	Thu Sep 28 15:22:03 2017 +0300
+++ b/weather.tcl	Thu Sep 28 15:24:36 2017 +0300
@@ -137,6 +137,9 @@
   set uvals(c_lng) [lindex $udata 3]
   set uvals(c_height) [lindex $udata 4]
   set uvals(vtime) [lindex $udata 5]
+  set uvals(temp) [lindex $udata 6]
+  set uvals(humidity) [lindex $udata 7]
+  set uvals(wind_speed) [lindex $udata 8]
 
   if {[expr [clock seconds] - $uvals(vtime)] < 3600} {
     set uvals(ctime) [clock format $uvals(vtime) -format "%H:%M"]
@@ -144,16 +147,8 @@
     set uvals(ctime) [clock format $uvals(vtime) -format "%H:%M (%d.%m.%Y)"]
   }
 
-  set uvals(temp) [lindex $udata 6]
-
-  if {[lindex $udata 1] == 0} {
-    set uvals(road_temp) [lindex $udata 7]
-    set uvals(weather1) [lindex $udata 8]
-    set uvals(weather2) [lindex $udata 9]
-  } else {
-    set uvals(humidity) [lindex $udata 7]
-    set uvals(wind_speed) [lindex $udata 8]
-    set uvals(cloud_cover) [lindex $udata 9]
+  for {set id 9} {$id < [llength $udata]} {incr id} {
+    set uvals(rv_$id) [lindex $udata $id]
   }
 
   set astr ""