Mercurial > hg > egg-tcls
annotate fetch_weather.pl @ 661:721c8cef5039
fetch_feeds: Clean up some comments.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 19 Feb 2021 21:06:20 +0200 |
parents | 14dfb925a64a |
children | 053d5662bb16 |
rev | line source |
---|---|
381 | 1 #!/usr/bin/perl -w |
182 | 2 ########################################################################## |
3 # | |
496
0b73fd8ee4cd
fetch_weather: Bump version.
Matti Hamalainen <ccr@tnsp.org>
parents:
495
diff
changeset
|
4 # Fetch Weather v1.2.0 by Matti 'ccr' Hamalainen <ccr@tnsp.org> |
578 | 5 # (C) Copyright 2014-2021 Tecnic Software productions (TNSP) |
206 | 6 # This script is freely distributable under GNU GPL (version 2) license. |
182 | 7 # |
8 # Should be ran as a cronjob, and configured properly. | |
206 | 9 # */10 * * * * perl -w /absolute/path/to/fetch_weather.pl /path/to/configfile |
182 | 10 # |
475
4075cf3e094c
fetch_weather: Update 'documentation'.
Matti Hamalainen <ccr@tnsp.org>
parents:
463
diff
changeset
|
11 # Configuration file example is in "config.fetch_weather.example" |
477
6773d97a3de2
fetch_weather: Add note about commandline options.
Matti Hamalainen <ccr@tnsp.org>
parents:
476
diff
changeset
|
12 # For debugging/testing, try ./fetch_weather.pl to see commandline options. |
182 | 13 # |
206 | 14 # Requires various Perl modules, in Debian the packages should be: |
475
4075cf3e094c
fetch_weather: Update 'documentation'.
Matti Hamalainen <ccr@tnsp.org>
parents:
463
diff
changeset
|
15 # libwww-perl libxml-simple-perl libtimedate-perl libjson-perl |
4075cf3e094c
fetch_weather: Update 'documentation'.
Matti Hamalainen <ccr@tnsp.org>
parents:
463
diff
changeset
|
16 # libfile-slurper-perl |
182 | 17 # |
18 ########################################################################## | |
417 | 19 use 5.18.0; |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
20 use strict; |
380
729eb88d1c63
fetch_weather: "use warnings".
Matti Hamalainen <ccr@tnsp.org>
parents:
379
diff
changeset
|
21 use warnings; |
243 | 22 use utf8; |
463
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
23 use Encode; |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
24 use LWP::UserAgent; |
399
a80de0130e45
fetch_weather: Support gzip encoded content in HTTP requests.
Matti Hamalainen <ccr@tnsp.org>
parents:
398
diff
changeset
|
25 use HTTP::Message; |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
26 use HTML::Entities; |
399
a80de0130e45
fetch_weather: Support gzip encoded content in HTTP requests.
Matti Hamalainen <ccr@tnsp.org>
parents:
398
diff
changeset
|
27 use Compress::Zlib; |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
28 use XML::Simple; |
189 | 29 use Date::Format; |
199
95012f8f687a
Another round of timestamp parsing changes, urgh.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
30 use Date::Parse; |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
31 use Data::Dumper; |
412
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
32 use File::Slurper qw(read_text write_binary); |
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
33 use JSON; |
166 | 34 |
400 | 35 |
162
4f8a163b2bc1
Work on the backend weather data fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
158
diff
changeset
|
36 ### |
182 | 37 ### Configuration settings |
162
4f8a163b2bc1
Work on the backend weather data fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
158
diff
changeset
|
38 ### |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
39 my %settings = ( |
442
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
40 "force_update" => 0, |
166 | 41 "debug" => 0, |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
42 "opt_fmi" => 0, |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
43 "opt_tiehallinto" => 0, |
374
26b7963e7fbd
fetch_weather: Oops, forgot to define the configuration setting
Matti Hamalainen <ccr@tnsp.org>
parents:
373
diff
changeset
|
44 "purge_threshold" => 60, |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
45 "outfile" => "", |
185
64e06ee172c7
Add HTTP user agent setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
182
diff
changeset
|
46 "http_user_agent" => "Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 6.0) Opera 10.63 [en]", |
446
ba559d5d44db
fetch_weather: Rename the Tiehallinto static metadata cache filename setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
47 "tiehallinto_meta" => "tiehallinto.meta", |
447
11124f9bf994
fetch_weather: Instead of checking the latest static metadata update timestamp against the weather data XML, have a setting of days until the metadata is considered stale.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
48 "tiehallinto_meta_period" => 7, |
495
ec5f0ed99a28
fetch_weather: Move base "hardcoded" FMI url and certain parameters into
Matti Hamalainen <ccr@tnsp.org>
parents:
491
diff
changeset
|
49 "tiehallinto_rw_url" => "https://tie.digitraffic.fi/api/v1/data/weather-data", |
ec5f0ed99a28
fetch_weather: Move base "hardcoded" FMI url and certain parameters into
Matti Hamalainen <ccr@tnsp.org>
parents:
491
diff
changeset
|
50 "tiehallinto_meta_url" => "https://tie.digitraffic.fi/api/v1/metadata/weather-stations", |
ec5f0ed99a28
fetch_weather: Move base "hardcoded" FMI url and certain parameters into
Matti Hamalainen <ccr@tnsp.org>
parents:
491
diff
changeset
|
51 "fmi_weather_base_url" => "https://opendata.fmi.fi/wfs", |
ec5f0ed99a28
fetch_weather: Move base "hardcoded" FMI url and certain parameters into
Matti Hamalainen <ccr@tnsp.org>
parents:
491
diff
changeset
|
52 "fmi_weather_extra_params" => "&maxlocations=300&bbox=19,59,32,75", |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
53 ); |
162
4f8a163b2bc1
Work on the backend weather data fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
158
diff
changeset
|
54 |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
55 |
162
4f8a163b2bc1
Work on the backend weather data fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
158
diff
changeset
|
56 ### |
4f8a163b2bc1
Work on the backend weather data fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
158
diff
changeset
|
57 ### Helper functions |
4f8a163b2bc1
Work on the backend weather data fetching.
Matti Hamalainen <ccr@tnsp.org>
parents:
158
diff
changeset
|
58 ### |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
59 sub mlog($) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
60 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
61 print STDERR $_[0]; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
62 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
63 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
64 |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
65 sub fetch_http($) |
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
66 { |
198 | 67 my $agent = LWP::UserAgent->new; |
461 | 68 $agent->agent(opt_get("http_user_agent")); |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
69 $agent->timeout(20); |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
70 |
198 | 71 my $req = HTTP::Request->new(GET => $_[0]); |
399
a80de0130e45
fetch_weather: Support gzip encoded content in HTTP requests.
Matti Hamalainen <ccr@tnsp.org>
parents:
398
diff
changeset
|
72 $req->header('Accept-Encoding' => scalar HTTP::Message::decodable()); |
339 | 73 |
411
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
74 print STDERR "# FETCHING URL: ".$_[0]."\n" if (opt_get_int("debug") > 0); |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
75 |
406
4c3abf052d01
fetch_weather: "use 5.018;" and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
405
diff
changeset
|
76 my $res = $agent->request($req); |
411
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
77 |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
78 if (opt_get_int("debug") > 0) |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
79 { |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
80 print STDERR "# Response: ".$res->code.": ".$res->message."\n"; |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
81 if ($res->code >= 200 && $res->code <= 201) |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
82 { |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
83 print STDERR |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
84 "# Content-charset: ".$res->content_charset."\n". |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
85 "# Content-encoding: ".$res->content_encoding."\n". |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
86 "# Is decoded_content UTF8? ".(utf8::is_utf8($res->decoded_content) ? "yes" : "NO!")."\n"; |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
87 } |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
88 } |
fe47617e7251
fetch_weather: Add some debugging output to fetch_http().
Matti Hamalainen <ccr@tnsp.org>
parents:
410
diff
changeset
|
89 |
406
4c3abf052d01
fetch_weather: "use 5.018;" and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
405
diff
changeset
|
90 return $res; |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
91 } |
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
92 |
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
93 |
382
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
94 sub str_trim($) |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
95 { |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
96 my $tmp = $_[0]; |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
97 $tmp =~ s/^\s*//; |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
98 $tmp =~ s/\s*$//; |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
99 return $tmp; |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
100 } |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
101 |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
102 |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
103 sub parse_timestamp($$) |
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
104 { |
196
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
105 my ($str, $offs) = @_; |
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
106 if ($str =~ /^(\d+):(\d+)$/) |
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
107 { |
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
108 return $offs + (60 * 60 * $1) + ($2 * 60); |
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
109 } |
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
110 else |
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
111 { |
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
112 return $offs; |
a38c123921a9
Change the timestamp parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
195
diff
changeset
|
113 } |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
114 } |
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
115 |
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
116 |
194 | 117 sub format_time_gmt($) |
189 | 118 { |
119 # 2012-02-27T00:00:00Z | |
199
95012f8f687a
Another round of timestamp parsing changes, urgh.
Matti Hamalainen <ccr@tnsp.org>
parents:
198
diff
changeset
|
120 return time2str("%Y-%m-%dT%TZ", $_[0], "UTC"); |
189 | 121 } |
122 | |
193 | 123 |
463
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
124 sub force_decode_utf8($) |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
125 { |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
126 if (!utf8::is_utf8($_[0])) |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
127 { |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
128 return decode("utf8", $_[0]); |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
129 } |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
130 else |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
131 { |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
132 return $_[0]; |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
133 } |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
134 } |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
135 |
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
136 |
410 | 137 ### Return either data or if not defined, empty string |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
138 sub plonk_data |
228 | 139 { |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
140 return defined($_[0]) ? $_[0] : (defined($_[1]) ? $_[1] : ""); |
228 | 141 } |
142 | |
143 | |
410 | 144 ### Same as plonk_data() but also lowercase the data string |
237 | 145 sub plonk_data_lc($) |
146 { | |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
147 return defined($_[0]) ? lc($_[0]) : (defined($_[1]) ? $_[1] : ""); |
237 | 148 } |
149 | |
150 | |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
151 ### |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
152 ### Configuration handling |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
153 ### |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
154 sub opt_chk_bool($) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
155 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
156 if (defined($settings{$_[0]})) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
157 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
158 my $val = $settings{$_[0]}; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
159 return ($val == 1 || $val eq "true" || $val eq "on" || $val eq "1"); |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
160 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
161 else |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
162 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
163 return 0; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
164 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
165 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
166 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
167 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
168 sub opt_chk_valid($$) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
169 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
170 if (defined($settings{$_[0]})) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
171 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
172 my $val = $settings{$_[0]}; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
173 return length($val) >= $_[1]; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
174 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
175 else |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
176 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
177 return 0; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
178 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
179 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
180 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
181 |
324
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
182 sub opt_get_int($) |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
183 { |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
184 if (defined($settings{$_[0]})) |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
185 { |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
186 return int($settings{$_[0]}); |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
187 } |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
188 else |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
189 { |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
190 return -1; |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
191 } |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
192 } |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
193 |
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
194 |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
195 sub opt_get($) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
196 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
197 if (defined($settings{$_[0]})) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
198 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
199 return $settings{$_[0]}; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
200 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
201 else |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
202 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
203 return undef; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
204 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
205 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
206 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
207 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
208 sub opt_read_config($) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
209 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
210 my $filename = $_[0]; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
211 my $errors = 0; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
212 my $line = 0; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
213 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
214 open(CONFFILE, "<", $filename) or die("Could not open configuration '".$filename."'!\n"); |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
215 while (<CONFFILE>) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
216 { |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
217 $line++; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
218 chomp; |
353 | 219 if (/(^\s*#|^\s*$)/) |
220 { | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
221 # Ignore comments and empty lines |
353 | 222 } |
386 | 223 elsif (/^\s*\"?([a-zA-Z0-9_]+)\"?\s*=>?\s*(\d+),?\s*$/) |
224 { | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
225 my $key = lc($1); |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
226 my $value = $2; |
461 | 227 if (defined($settings{$key})) |
228 { | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
229 $settings{$key} = $value; |
353 | 230 } |
231 else | |
232 { | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
233 mlog("[$filename:$line] Unknown setting '$key' = $value\n"); |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
234 $errors = 1; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
235 } |
353 | 236 } |
386 | 237 elsif (/^\s*\"?([a-zA-Z0-9_]+)\"?\s*=>?\s*\"(.*?)\",?\s*$/) |
238 { | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
239 my $key = lc($1); |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
240 my $value = $2; |
353 | 241 if (defined($settings{$key})) |
242 { | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
243 $settings{$key} = $value; |
353 | 244 } |
245 else | |
246 { | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
247 mlog("[$filename:$line] Unknown setting '$key' = '$value'\n"); |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
248 $errors = 1; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
249 } |
353 | 250 } |
251 else | |
252 { | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
253 mlog("[$filename:$line] Syntax error: $_\n"); |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
254 $errors = 1; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
255 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
256 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
257 close(CONFFILE); |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
258 return $errors; |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
259 } |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
260 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
261 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
262 ### |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
263 ### Main program begins |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
264 ### |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
265 my $weatherdata = {}; |
442
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
266 my $opt_cfgfile; |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
267 |
442
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
268 while (scalar(@ARGV) > 0) |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
269 { |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
270 my $arg = shift; |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
271 if ($arg eq "-force") |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
272 { |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
273 $settings{"force_update"} = 1; |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
274 } |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
275 elsif ($arg eq "-debug") |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
276 { |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
277 $settings{"debug"} = 1; |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
278 } |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
279 else |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
280 { |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
281 die("Configuration file already specified!\n") if defined($opt_cfgfile); |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
282 $opt_cfgfile = $arg; |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
283 } |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
284 } |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
285 |
442
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
286 if (!defined($opt_cfgfile)) |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
287 { |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
288 die( |
450
aa8cc5b67585
fetch_weather: Bump version.
Matti Hamalainen <ccr@tnsp.org>
parents:
448
diff
changeset
|
289 "Weather Fetch v1.0 by ccr/TNSP <ccr\@tnsp.org>\n". |
442
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
290 "Usage: $0 <config file> [options]\n". |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
291 "\n". |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
292 " -force : Force updating of all data\n". |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
293 " -debug : Enable debug\n". |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
294 "\n" |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
295 ); |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
296 } |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
297 |
19fe8ef0a902
fetch_weather: Improve commandline handling, add -force and -debug options.
Matti Hamalainen <ccr@tnsp.org>
parents:
438
diff
changeset
|
298 opt_read_config($opt_cfgfile) == 0 or die("Errors while parsing configuration file '".$opt_cfgfile."'.\n"); |
461 | 299 print STDERR "Forcing update of all data.\n" if opt_chk_bool("force_update"); |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
300 |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
301 |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
302 ### |
354
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
303 ### Load already cached data |
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
304 ### |
462
9b4b1e4ce313
fetch_weather: When force_update is set, do not load the old data cache.
Matti Hamalainen <ccr@tnsp.org>
parents:
461
diff
changeset
|
305 if (opt_chk_valid("outfile", 1) && !opt_chk_bool("force_update")) |
354
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
306 { |
438
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
307 my $filename = opt_get("outfile"); |
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
308 if (-e "$filename") |
354
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
309 { |
463
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
310 my $str = force_decode_utf8(read_text($filename)); |
438
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
311 if (defined($str)) |
354
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
312 { |
438
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
313 foreach my $line (split(/\s*\n\s*/, $str)) |
354
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
314 { |
438
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
315 my @mtmp = split(/\|/, $line, -1); |
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
316 if (scalar(\@mtmp) >= 3) |
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
317 { |
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
318 $weatherdata->{shift @mtmp} = \@mtmp; |
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
319 } |
354
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
320 } |
438
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
321 print STDERR scalar(keys %$weatherdata)." old records reloaded.\n" if (opt_get_int("debug") > 0); |
354
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
322 } |
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
323 } |
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
324 } |
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
325 |
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
326 |
de411e7834aa
fetch_weather: Reload old data from stored data.
Matti Hamalainen <ccr@tnsp.org>
parents:
353
diff
changeset
|
327 ### |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
328 ### Fetch Tiehallinto data |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
329 ### |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
330 if (opt_chk_bool("opt_tiehallinto")) |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
331 { |
443
1f16d27c571d
fetch_weather: Make tiehallinto API urls configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
332 my $uri = opt_get("tiehallinto_rw_url"); |
406
4c3abf052d01
fetch_weather: "use 5.018;" and some cleanups.
Matti Hamalainen <ccr@tnsp.org>
parents:
405
diff
changeset
|
333 print STDERR "Fetching Tiehallinto road weather data from ".$uri."\n" if (opt_get_int("debug") > 0); |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
334 my $res = fetch_http($uri); |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
335 if ($res->code >= 200 && $res->code <= 201) |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
336 { |
463
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
337 my $json_str = force_decode_utf8($res->decoded_content); |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
338 my $data = JSON->new->decode($json_str); |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
339 |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
340 #print $json_str."\n"; die("\n"); |
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
341 |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
342 if (!defined($data->{"dataUpdatedTime"}) || !defined($data->{"weatherStations"})) |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
343 { |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
344 print STDERR "ERROR: REST/JSON call result did not contain required data.\n"; |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
345 print STDERR $json_str."\n\n"; |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
346 } |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
347 else |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
348 { |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
349 # Check if we need to update the static meta data |
446
ba559d5d44db
fetch_weather: Rename the Tiehallinto static metadata cache filename setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
445
diff
changeset
|
350 my $meta_file = opt_get("tiehallinto_meta"); |
447
11124f9bf994
fetch_weather: Instead of checking the latest static metadata update timestamp against the weather data XML, have a setting of days until the metadata is considered stale.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
351 my $meta_stamp = (-e $meta_file) ? (stat($meta_file))[9] : -1; |
11124f9bf994
fetch_weather: Instead of checking the latest static metadata update timestamp against the weather data XML, have a setting of days until the metadata is considered stale.
Matti Hamalainen <ccr@tnsp.org>
parents:
446
diff
changeset
|
352 my $fetch_meta = ($meta_stamp + 60*60*24 * opt_get_int("tiehallinto_meta_period")) < time(); |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
353 |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
354 # Fetch or read the cache |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
355 my $meta_str; |
444 | 356 if ($fetch_meta || opt_chk_bool("force_update")) |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
357 { |
443
1f16d27c571d
fetch_weather: Make tiehallinto API urls configurable.
Matti Hamalainen <ccr@tnsp.org>
parents:
442
diff
changeset
|
358 my $uri = opt_get("tiehallinto_meta_url"); |
445 | 359 print STDERR "Fetching Tiehallinto static meta data from ".$uri."\n" if (opt_get_int("debug") > 1); |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
360 my $res = fetch_http($uri); |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
361 die("Failed to fetch $uri data.\n") unless ($res->code <= 200 && $res->code <= 201); |
339 | 362 |
463
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
363 $meta_str = force_decode_utf8($res->decoded_content); |
412
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
364 $fetch_meta = 1; |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
365 } |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
366 else |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
367 { |
445 | 368 print STDERR "Using CACHED Tiehallinto static meta data from '".$meta_file."'.\n" if (opt_get_int("debug") > 0); |
463
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
369 $meta_str = force_decode_utf8(read_text($meta_file)); |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
370 } |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
371 |
416
c88f7449b526
fetch_weather: Possibly another UTF8 fix :S
Matti Hamalainen <ccr@tnsp.org>
parents:
414
diff
changeset
|
372 print STDERR "Is meta_str UTF8? ".(utf8::is_utf8($meta_str) ? "yes" : "NO!")."\n" if (opt_get_int("debug") > 0); |
c88f7449b526
fetch_weather: Possibly another UTF8 fix :S
Matti Hamalainen <ccr@tnsp.org>
parents:
414
diff
changeset
|
373 |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
374 # Parse the data .. |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
375 my $meta_data = {}; |
412
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
376 my $json = JSON->new->decode($meta_str); |
398 | 377 |
412
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
378 if ($fetch_meta) |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
379 { |
412
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
380 # Save new cache, in more optimal form, if needed. |
445 | 381 print STDERR "Storing to cache '".$meta_file."'.\n" if (opt_get_int("debug") > 0); |
463
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
382 write_binary($meta_file, JSON->new->utf8->encode($json)); |
412
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
383 } |
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
384 |
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
385 foreach my $ms (@{$json->{"features"}}) |
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
386 { |
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
387 if (defined($ms->{"properties"}) && |
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
388 defined($ms->{"geometry"}{"coordinates"}) && |
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
389 defined($ms->{"properties"}{"names"}{"fi"})) |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
390 { |
412
e0d86ccef873
fetch_weather: Change to using JSON static weather station metadata from digitraffic instead of the "old" API's CSV format data.
Matti Hamalainen <ccr@tnsp.org>
parents:
411
diff
changeset
|
391 $meta_data->{$ms->{"id"}} = $ms; |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
392 } |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
393 } |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
394 |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
395 my $nrecords = 0; |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
396 foreach my $wdata (@{$data->{"weatherStations"}}) |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
397 { |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
398 my $wid = $wdata->{"id"}; |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
399 if (defined($meta_data->{$wid}) && defined($wdata->{"sensorValues"})) |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
400 { |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
401 $wdata->{"sensors"} = {}; |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
402 foreach my $sensor (@{$wdata->{"sensorValues"}}) |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
403 { |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
404 $wdata->{"sensors"}->{$sensor->{"oldName"}} = $sensor; |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
405 } |
414
d623652df6b5
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.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
406 |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
407 $nrecords++; |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
408 $weatherdata->{$meta_data->{$wid}{"properties"}{"names"}{"fi"}} = |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
409 [ |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
410 # Measurement source type |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
411 1, |
414
d623652df6b5
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.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
412 |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
413 # Basic data |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
414 plonk_data($meta_data->{$wid}{"geometry"}{"coordinates"}[1], 0), |
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
415 plonk_data($meta_data->{$wid}{"geometry"}{"coordinates"}[0], 0), |
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
416 plonk_data($meta_data->{$wid}{"geometry"}{"coordinates"}[2], 0), |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
417 str2time(plonk_data($wdata->{"measuredTime"})), |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
418 plonk_data($wdata->{"sensors"}->{"airtemperature1"}->{"sensorValue"}), |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
419 plonk_data($wdata->{"sensors"}->{"humidity"}->{"sensorValue"}), |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
420 plonk_data($wdata->{"sensors"}->{"averagewindspeed"}->{"sensorValue"}), |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
421 plonk_data($wdata->{"sensors"}->{"winddirection"}->{"sensorValue"}), |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
422 |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
423 # Station type dependant data |
489
120eb7eb7398
fetch_weather, weather: Fixes/adjustments to the previous changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
488
diff
changeset
|
424 "", # unused for station type 1 |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
425 plonk_data($wdata->{"sensors"}->{"roadsurfacetemperature1"}->{"sensorValue"}), |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
426 plonk_data($wdata->{"sensors"}->{"precipitation"}->{"sensorValueDescriptionFi"}), |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
427 plonk_data($wdata->{"sensors"}->{"visibility"}->{"sensorValue"}), |
577
e5e4b068d56b
fetch_weather: Add precipitation data.
Matti Hamalainen <ccr@tnsp.org>
parents:
496
diff
changeset
|
428 plonk_data($wdata->{"sensors"}->{"precipitation"}->{"sensorValue"}), |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
429 ]; |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
430 } |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
431 else |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
432 { |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
433 print STDERR "Station ID #".$wid." not defined?\n" if (opt_get_int("debug") > 0); |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
434 #.Dumper($meta_data->{$wid}); |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
435 } |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
436 } |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
437 print STDERR $nrecords." records from Tiehallinto.\n" if (opt_get_int("debug") > 0); |
338
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
438 } |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
439 } |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
440 } |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
441 |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
442 |
afb8c0e2d513
fetch_weather: Implement support for new Tiehallinto data API.
Matti Hamalainen <ccr@tnsp.org>
parents:
332
diff
changeset
|
443 ### |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
444 ### Fetch FMI data |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
445 ### |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
446 if (opt_chk_bool("opt_fmi")) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
447 { |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
448 my @fmitems = ("temperature", "humidity", "windspeedms", "winddirection", "totalcloudcover"); |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
449 |
495
ec5f0ed99a28
fetch_weather: Move base "hardcoded" FMI url and certain parameters into
Matti Hamalainen <ccr@tnsp.org>
parents:
491
diff
changeset
|
450 my $uri = opt_get("fmi_weather_base_url"). |
486
b352722e8717
fetch_weather: FMI open data no longer requires an API key. Also the data
Matti Hamalainen <ccr@tnsp.org>
parents:
477
diff
changeset
|
451 "?request=getFeature". |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
452 "&storedquery_id=fmi::observations::weather::multipointcoverage". |
194 | 453 "&starttime=".format_time_gmt(time() - 10*60)."&endtime=".format_time_gmt(time()). |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
454 "¶meters=".join(",", @fmitems). |
495
ec5f0ed99a28
fetch_weather: Move base "hardcoded" FMI url and certain parameters into
Matti Hamalainen <ccr@tnsp.org>
parents:
491
diff
changeset
|
455 opt_get("fmi_weather_extra_params"); |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
456 |
324
19c64798de91
weather: Add some better optional debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
247
diff
changeset
|
457 print STDERR "FMI URI: ".$uri."\n" if (opt_get_int("debug") > 0); |
189 | 458 |
459 my $res = fetch_http($uri); | |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
460 if ($res->code >= 200 && $res->code <= 201) |
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
461 { |
463
fe478b7bd80e
fetch_weather: Perhaps, possibly, fix the UTF8 issues. Maybe.
Matti Hamalainen <ccr@tnsp.org>
parents:
462
diff
changeset
|
462 my $xml = XMLin(force_decode_utf8($res->decoded_content)); |
169
c12e422a543a
FMI data parsing kinda almost works. It is horrible, though. XML ... :Q
Matti Hamalainen <ccr@tnsp.org>
parents:
168
diff
changeset
|
463 my $time_base = time(); |
339 | 464 |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
465 #print $res->decoded_content; die("\n"); |
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
466 |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
467 if (defined($xml->{"wfs:member"}{"omso:GridSeriesObservation"})) |
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
468 { |
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
469 my $fdata = $xml->{"wfs:member"}{"omso:GridSeriesObservation"}; |
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
470 my $fshit = $fdata->{"om:result"}{"gmlcov:MultiPointCoverage"}; |
378
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
471 |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
472 my @position_lines = split(/\n/, $fshit->{"gml:domainSet"}{"gmlcov:SimpleMultiPoint"}{"gmlcov:positions"}); |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
473 my @data_lines = split(/\n/, $fshit->{"gml:rangeSet"}{"gml:DataBlock"}{"gml:doubleOrNilReasonTupleList"}); |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
474 my @farray = (); |
169
c12e422a543a
FMI data parsing kinda almost works. It is horrible, though. XML ... :Q
Matti Hamalainen <ccr@tnsp.org>
parents:
168
diff
changeset
|
475 |
378
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
476 if (scalar(@position_lines) == scalar(@data_lines)) |
169
c12e422a543a
FMI data parsing kinda almost works. It is horrible, though. XML ... :Q
Matti Hamalainen <ccr@tnsp.org>
parents:
168
diff
changeset
|
477 { |
378
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
478 for (my $nline = 0; $nline < scalar(@position_lines); $nline++) |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
479 { |
382
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
480 my $dline = str_trim($data_lines[$nline]); |
5573c1681da9
fetch_weather: Trim split input data lines in FMI XML.
Matti Hamalainen <ccr@tnsp.org>
parents:
381
diff
changeset
|
481 my $pline = str_trim($position_lines[$nline]); |
378
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
482 |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
483 my @fmatches = ($dline =~ /\s*([\+\-]?\d+\.\d*|NaN)\s*/ig); |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
484 if (scalar(@fmatches) != scalar(@fmitems)) |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
485 { |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
486 print STDERR "Not enough items in scalar line #".$nline." (". |
452
ec97c29768e7
fetch_weather: Improve some debug messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
450
diff
changeset
|
487 scalar(@fmatches). " vs ".scalar(@fmitems)."): ".$dline."\n" |
ec97c29768e7
fetch_weather: Improve some debug messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
450
diff
changeset
|
488 if (opt_get_int("debug") > 0); |
378
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
489 } |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
490 else |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
491 { |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
492 my $vtmp = {}; |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
493 for (my $fni = 0; $fni < scalar(@fmitems); $fni++) |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
494 { |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
495 $$vtmp{$fmitems[$fni]} = $fmatches[$fni] if (lc($fmatches[$fni]) ne "nan"); |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
496 } |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
497 if ($pline =~ /^\s*([\+\-]?\d+\.\d*)\s+([\+\-]?\d+\.\d*)\s+(\d+)\s*$/) |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
498 { |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
499 $$vtmp{"lat"} = $1; |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
500 $$vtmp{"long"} = $2; |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
501 $$vtmp{"time"} = $3; |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
502 push(@farray, $vtmp); |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
503 } |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
504 else |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
505 { |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
506 print STDERR "Data mismatch #".$nline.": ".$pline."\n"; |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
507 } |
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
508 } |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
509 } |
169
c12e422a543a
FMI data parsing kinda almost works. It is horrible, though. XML ... :Q
Matti Hamalainen <ccr@tnsp.org>
parents:
168
diff
changeset
|
510 } |
378
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
511 else |
169
c12e422a543a
FMI data parsing kinda almost works. It is horrible, though. XML ... :Q
Matti Hamalainen <ccr@tnsp.org>
parents:
168
diff
changeset
|
512 { |
452
ec97c29768e7
fetch_weather: Improve some debug messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
450
diff
changeset
|
513 print STDERR "Position and data line counts do not match ". |
ec97c29768e7
fetch_weather: Improve some debug messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
450
diff
changeset
|
514 scalar(@position_lines)." <> ".scalar(@data_lines)."\n"; |
378
b706e8ebecf8
fetch_weather: Possibly improve FMI XML mess parsing.
Matti Hamalainen <ccr@tnsp.org>
parents:
377
diff
changeset
|
515 goto skip_it; |
189 | 516 } |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
517 # XXX Hashify the array into lat/long keys |
339 | 518 |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
519 # This is horrible :S |
352
19b363586b40
fetch_weather: Fix debug prints.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
520 my $nrecords = 0; |
410 | 521 foreach my $xnode (@{$fdata->{"om:featureOfInterest"}{"sams:SF_SpatialSamplingFeature"}{"sams:shape"}{"gml:MultiPoint"}{"gml:pointMember"}}) |
189 | 522 { |
228 | 523 my $floc = $xnode->{"gml:Point"}; |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
524 if ($floc->{"gml:pos"} =~ /^\s*([\+\-]?\d+\.\d*)\s+([\+\-]?\d+\.\d*)\s*$/) |
189 | 525 { |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
526 my ($flat, $flong) = ($1, $2); |
349
f7793ef7c925
fetch_weather: Improve debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
343
diff
changeset
|
527 |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
528 # Should use a hash - |
410 | 529 foreach my $frec (@farray) |
189 | 530 { |
410 | 531 if ($frec->{"lat"} == $flat && $frec->{"long"} == $flong && |
383
1ba1191da15d
fetch_weather: Check for empty station name.
Matti Hamalainen <ccr@tnsp.org>
parents:
382
diff
changeset
|
532 $floc->{"gml:name"} ne "") |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
533 { |
349
f7793ef7c925
fetch_weather: Improve debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
343
diff
changeset
|
534 $nrecords++; |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
535 $weatherdata->{$floc->{"gml:name"}} = |
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
536 [ |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
537 # Measurement source type |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
538 2, |
410 | 539 |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
540 # Basic data |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
541 plonk_data($frec->{"lat"}, 0), |
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
542 plonk_data($frec->{"long"}, 0), |
414
d623652df6b5
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.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
543 0, |
410 | 544 plonk_data($frec->{"time"}), |
545 plonk_data($frec->{"temperature"}), | |
546 plonk_data($frec->{"humidity"}), | |
547 plonk_data($frec->{"windspeedms"}), | |
487
b4be881a9908
fetch_weather, weather: Add primitive support for wind direction data.
Matti Hamalainen <ccr@tnsp.org>
parents:
486
diff
changeset
|
548 plonk_data($frec->{"winddirection"}), |
448
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
549 |
ac3b79eca0ca
fetch_weather: Change to use the new REST/JSON API for fetching Tiehallinto digitraffic weather data.
Matti Hamalainen <ccr@tnsp.org>
parents:
447
diff
changeset
|
550 # Station type dependant data |
491
f5c023538e2a
fetch_weather, weather: Remove certain "data translation" from fetch_weather and move that into weather.tcl.
Matti Hamalainen <ccr@tnsp.org>
parents:
489
diff
changeset
|
551 plonk_data($frec->{"totalcloudcover"}), |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
552 ]; |
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
553 } |
189 | 554 } |
555 } | |
169
c12e422a543a
FMI data parsing kinda almost works. It is horrible, though. XML ... :Q
Matti Hamalainen <ccr@tnsp.org>
parents:
168
diff
changeset
|
556 } |
352
19b363586b40
fetch_weather: Fix debug prints.
Matti Hamalainen <ccr@tnsp.org>
parents:
349
diff
changeset
|
557 print STDERR $nrecords." records from FMI.\n" if (opt_get_int("debug") > 0); |
353 | 558 } |
559 else | |
560 { | |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
561 # defined |
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
562 print STDERR "Invalid XML received:\n"; |
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
563 print STDERR $res->decoded_content."\n\n"; |
169
c12e422a543a
FMI data parsing kinda almost works. It is horrible, though. XML ... :Q
Matti Hamalainen <ccr@tnsp.org>
parents:
168
diff
changeset
|
564 } |
353 | 565 } |
566 else | |
567 { | |
208
c6bbf69afc57
Add some error handling and debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
206
diff
changeset
|
568 print STDERR "Error fetching FMI XML: ".$res->status_line."\n"; |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
569 } |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
570 } |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
571 |
164
d5a0e4248f3e
weather: Implement configuration file support for weather fetcher backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
162
diff
changeset
|
572 |
375
c303ddc0a683
fetch_weather: Don't die() in case of bad XML from FMI, just skip parsing
Matti Hamalainen <ccr@tnsp.org>
parents:
374
diff
changeset
|
573 ### Skip here if the FMI shit fails due to broken data |
c303ddc0a683
fetch_weather: Don't die() in case of bad XML from FMI, just skip parsing
Matti Hamalainen <ccr@tnsp.org>
parents:
374
diff
changeset
|
574 skip_it: |
c303ddc0a683
fetch_weather: Don't die() in case of bad XML from FMI, just skip parsing
Matti Hamalainen <ccr@tnsp.org>
parents:
374
diff
changeset
|
575 |
c303ddc0a683
fetch_weather: Don't die() in case of bad XML from FMI, just skip parsing
Matti Hamalainen <ccr@tnsp.org>
parents:
374
diff
changeset
|
576 |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
577 ### |
394
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
578 ### Purge too old entries |
371
36869897f21d
fetch_weather: Purge sufficiently old data.
Matti Hamalainen <ccr@tnsp.org>
parents:
370
diff
changeset
|
579 ### |
394
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
580 if (opt_chk_valid("purge_threshold", 1)) |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
581 { |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
582 my $purge = opt_get_int("purge_threshold"); |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
583 if ($purge > 0) |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
584 { |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
585 my $wqtime = time(); |
395
33b5e7adc30c
fetch_weather: Make purge_threshold output some information when debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
394
diff
changeset
|
586 my $nold = scalar(keys %$weatherdata); |
373
bc7746ca622e
fetch_weather: Implement purge_threshold setting.
Matti Hamalainen <ccr@tnsp.org>
parents:
371
diff
changeset
|
587 |
394
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
588 foreach my $key (keys %$weatherdata) |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
589 { |
414
d623652df6b5
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.
Matti Hamalainen <ccr@tnsp.org>
parents:
413
diff
changeset
|
590 if ($wqtime - $weatherdata->{$key}[4] > (60 * $purge)) |
394
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
591 { |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
592 delete $$weatherdata{$key}; |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
593 } |
315f31e4f964
fetch_weather: Make purge_threshold option entirely optional, e.g. not set or 0 will disable purging.
Matti Hamalainen <ccr@tnsp.org>
parents:
392
diff
changeset
|
594 } |
395
33b5e7adc30c
fetch_weather: Make purge_threshold output some information when debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
394
diff
changeset
|
595 |
33b5e7adc30c
fetch_weather: Make purge_threshold output some information when debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
394
diff
changeset
|
596 my $nnew = scalar(keys %$weatherdata); |
33b5e7adc30c
fetch_weather: Make purge_threshold output some information when debugging.
Matti Hamalainen <ccr@tnsp.org>
parents:
394
diff
changeset
|
597 print STDERR "Purged data older than ".$purge." minutes, ".$nold." -> ".$nnew." = ".($nold - $nnew)." removed.\n" if (opt_get_int("debug") > 0); |
371
36869897f21d
fetch_weather: Purge sufficiently old data.
Matti Hamalainen <ccr@tnsp.org>
parents:
370
diff
changeset
|
598 } |
36869897f21d
fetch_weather: Purge sufficiently old data.
Matti Hamalainen <ccr@tnsp.org>
parents:
370
diff
changeset
|
599 } |
36869897f21d
fetch_weather: Purge sufficiently old data.
Matti Hamalainen <ccr@tnsp.org>
parents:
370
diff
changeset
|
600 |
36869897f21d
fetch_weather: Purge sufficiently old data.
Matti Hamalainen <ccr@tnsp.org>
parents:
370
diff
changeset
|
601 |
36869897f21d
fetch_weather: Purge sufficiently old data.
Matti Hamalainen <ccr@tnsp.org>
parents:
370
diff
changeset
|
602 ### |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
603 ### Output |
178
9b8ec700ede4
Clean up the weather data parser backend a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
170
diff
changeset
|
604 ### |
353 | 605 if (opt_chk_valid("outfile", 1)) |
606 { | |
438
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
607 my $filename = opt_get("outfile"); |
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
608 print STDERR "Dumping data to output file '".$filename."'\n" if (opt_get_int("debug") > 0); |
368
ed1c7f2d81df
fetch_weather: Close STDOUT filehandle before reopening it, to make sure we
Matti Hamalainen <ccr@tnsp.org>
parents:
367
diff
changeset
|
609 close(STDOUT); |
438
a17b7fdd03c0
fetch_weather: Simplify and check for existence of output file before trying to read the old one.
Matti Hamalainen <ccr@tnsp.org>
parents:
417
diff
changeset
|
610 open(STDOUT, '>', $filename) or die("Could not open output file '".$filename."': $!\n"); |
158
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
611 } |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
612 |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
613 binmode STDOUT, ':encoding(utf-8)'; |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
614 |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
615 foreach my $key (sort { $a cmp $b } keys %$weatherdata) |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
616 { |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
617 print STDOUT $key."|".join("|", @{$weatherdata->{$key}})."\n"; |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
618 } |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
619 |
db2b1f74d994
Initial import of weather data fetching backend, written in Perl.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
620 close(STDOUT); |