Mercurial > hg > egg-tcls
diff weather.tcl @ 690:8a6cca58e853
fetch_weather, weather: Update to match with Digitraffic API changes.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Thu, 22 Jun 2023 13:32:07 +0300 |
| parents | 2723be85343a |
| children | e1aba44b8c7b |
line wrap: on
line diff
--- a/weather.tcl Thu Jun 22 13:28:34 2023 +0300 +++ b/weather.tcl Thu Jun 22 13:32:07 2023 +0300 @@ -1,7 +1,7 @@ ########################################################################## # -# Weather v2.1.0 by Matti 'ccr' Hamalainen <ccr@tnsp.org> -# (C) Copyright 2014-2021 Tecnic Software productions (TNSP) +# Weather v2.2.0 by Matti 'ccr' Hamalainen <ccr@tnsp.org> +# (C) Copyright 2014-2023 Tecnic Software productions (TNSP) # # Requires data fetcher to be run as a cronjob, see fetch_weather.pl # for more information. @@ -25,7 +25,7 @@ package require textutil::split set weather_name "Weather" -set weather_message "$weather_name v2.1.0 (C) 2014-2021 ccr/TNSP" +set weather_message "$weather_name v2.2.0 (C) 2014-2023 ccr/TNSP" #------------------------------------------------------------------------- @@ -130,7 +130,7 @@ gets $ufile uline set udata [split $uline "|"] if {[llength $udata] > 0} { - set utemp [lindex $udata 6] + set utemp [lindex $udata 4] set ukey [lindex $udata 0] set weather_data($ukey) $udata @@ -231,23 +231,21 @@ array unset uvals set uvals(station) [lindex $udata 0] - set uvals(type) [lindex $udata 1] - set uvals(c_lat) [lindex $udata 2] - 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] - set uvals(wind_direction) [weather_get_wind_direction [lindex $udata 9]] - set uvals(wind_direction_deg) [lindex $udata 9] - set uvals(cloudiness) [weather_get_table_value $weather_msg_cloudiness [lindex $udata 10]] - set uvals(cloudiness_val) [weather_get_raw_table_value $weather_msg_cloudiness [lindex $udata 10]] - set uvals(road_surface_temp) [lindex $udata 11] - set uvals(precipitation) [lindex $udata 12] - set uvals(visibility) [lindex $udata 13] - set uvals(precipitation2) [weather_get_table_value $weather_msg_precipitation [lindex $udata 14]] - set uvals(precipitation_val) [weather_get_raw_table_value $weather_msg_precipitation [lindex $udata 14]] + set uvals(c_lat) [lindex $udata 1] + set uvals(c_lng) [lindex $udata 2] + set uvals(vtime) [lindex $udata 3] + set uvals(temp) [lindex $udata 4] + set uvals(humidity) [lindex $udata 5] + set uvals(wind_speed) [lindex $udata 6] + set uvals(wind_direction) [weather_get_wind_direction [lindex $udata 7]] + set uvals(wind_direction_deg) [lindex $udata 7] + set uvals(cloudiness) [weather_get_table_value $weather_msg_cloudiness [lindex $udata 8]] + set uvals(cloudiness_val) [weather_get_raw_table_value $weather_msg_cloudiness [lindex $udata 8]] + set uvals(road_surface_temp) [lindex $udata 9] + set uvals(precipitation) [lindex $udata 10] + set uvals(visibility) [lindex $udata 11] + set uvals(precipitation2) [weather_get_table_value $weather_msg_precipitation [lindex $udata 12]] + set uvals(precipitation_val) [weather_get_raw_table_value $weather_msg_precipitation [lindex $udata 13]] if {[expr [clock seconds] - $uvals(vtime)] < 3600} { set uvals(ctime) [clock format $uvals(vtime) -format "%H:%M"]