Mercurial > hg > egg-tcls

comparison weather.tcl @ 414:d623652df6b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch_weather / weather: Add weather measurement station location data (GPS WGS-84 lat/long/height) to weather cache. Not used in weather.tcl yet, tho.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 07 Jan 2017 22:37:56 +0200
parents 3a9e565c1676
children ff932030a9b3
comparison
equal deleted inserted replaced
413:b63525aed190 414:d623652df6b5
141 141
142 # Set data to array 142 # Set data to array
143 array unset uvals 143 array unset uvals
144 set uvals(station) [lindex $udata 0] 144 set uvals(station) [lindex $udata 0]
145 set uvals(type) [lindex $udata 1] 145 set uvals(type) [lindex $udata 1]
146 set uvals(vtime) [lindex $udata 2] 146 set uvals(c_lat) [lindex $udata 2]
147 set uvals(c_long) [lindex $udata 3]
148 set uvals(c_height) [lindex $udata 4]
149 set uvals(vtime) [lindex $udata 5]
147 150
148 if {[expr [clock seconds] - $uvals(vtime)] < 3600} { 151 if {[expr [clock seconds] - $uvals(vtime)] < 3600} {
149 set uvals(ctime) [clock format $uvals(vtime) -format "%H:%M"] 152 set uvals(ctime) [clock format $uvals(vtime) -format "%H:%M"]
150 } else { 153 } else {
151 set uvals(ctime) [clock format $uvals(vtime) -format "%H:%M (%d.%m.%Y)"] 154 set uvals(ctime) [clock format $uvals(vtime) -format "%H:%M (%d.%m.%Y)"]
152 } 155 }
153 156
154 set uvals(temp) [lindex $udata 3] 157 set uvals(temp) [lindex $udata 6]
155 158
156 if {[lindex $udata 1] == 0} { 159 if {[lindex $udata 1] == 0} {
157 set uvals(road_temp) [lindex $udata 4] 160 set uvals(road_temp) [lindex $udata 7]
158 set uvals(weather1) [lindex $udata 5] 161 set uvals(weather1) [lindex $udata 8]
159 set uvals(weather2) [lindex $udata 6] 162 set uvals(weather2) [lindex $udata 9]
160 } else { 163 } else {
161 set uvals(humidity) [lindex $udata 4] 164 set uvals(humidity) [lindex $udata 7]
162 set uvals(wind_speed) [lindex $udata 5] 165 set uvals(wind_speed) [lindex $udata 8]
163 set uvals(cloud_cover) [lindex $udata 6] 166 set uvals(cloud_cover) [lindex $udata 9]
164 } 167 }
165 168
166 # Transform the format list 169 # Transform the format list
167 set astr "" 170 set astr ""
168 foreach aitem $weather_msg_result { 171 foreach aitem $weather_msg_result {
206 # Read in the data 209 # Read in the data
207 while {![eof $ufile]} { 210 while {![eof $ufile]} {
208 gets $ufile uline 211 gets $ufile uline
209 set udata [split $uline "|"] 212 set udata [split $uline "|"]
210 if {[llength $udata] > 0} { 213 if {[llength $udata] > 0} {
211 set utemp [lindex $udata 3] 214 set utemp [lindex $udata 6]
212 set ukey [lindex $udata 0] 215 set ukey [lindex $udata 0]
213 216
214 set weather_data($ukey) $udata 217 set weather_data($ukey) $udata
215 218
216 if {[string is double -strict $utemp]} { 219 if {[string is double -strict $utemp]} {