Commit Graph

47 Commits

Author SHA1 Message Date
Jeremy Stanley
230ad93b11 Refresh active station list and correlation data
Perform a fresh build of data sets from current sources, and add a
few additional overrides for previously unknown stations.
2020-07-26 19:10:14 +00:00
Jeremy Stanley
a1fe816de3 Make missing alert URLs non-fatal
As a more complete fix and future-proofing for the earlier mismatch
between default_atypes and the alert URLs generated for WX zones
during correlation, stop aborting and simply add a warning if a
requested alert type has no corresponding URL.
2020-07-26 19:09:14 +00:00
Jeremy Stanley
9fa7d3cf18 Correct default_atypes to match what's generated
Kevin Monceaux reported a regression with the 2.4 release. Running
with the -a/--alert option and no limited --atypes or atypes
override in weatherrc resulted in a message about undefined URLs
and no normal output. This problem crept in when hard-coding alert
types in the correlator after ditching the woefully unmaintained
zonecatalog.curr.tar data source (commit 8a37edd).

Update default_atypes so that it covers all relevant non-forecast
URLs the correlate routine embeds.
2020-07-26 19:04:33 +00:00
Chris Lamb
8ad1f3f02c Make the build reproducible
While auditing Debian's packages, Chris Lamb reported[*] that
weather-util's correlation set generation is not reproducible
because it embeds timestamps without a means to override them and
also varies by system timezone. Allow SOURCE_DATE_EPOCH from the
calling environment and assume UTC rather than relying on locale
settings when no timezones are specified.

[*] https://bugs.debian.org/964721
2020-07-25 15:23:20 +00:00
Jeremy Stanley
9e7002438b Update release notes and docs for 2.4 release 2020-06-21 20:20:33 +00:00
Jeremy Stanley
1bbdcd7e89 Get correlate() working in modern Python 3
Update a bunch of the parsing for various correlation source files
to work in both Python 2.7 and 3.5+, mostly where str vs bytes and
UTF-8 encoding/decoding are concerned. This can be cleaned up
significantly once support for 2.7 is finally dropped.
2020-06-21 20:13:14 +00:00
Jeremy Stanley
0a4712f9a8 Be more thorough about file copyrights
Add a copyright header to the .gitignore file with start and end
years determined from its commit history. Add copyright headers for
the current year to overrides.log and qa.log, and also add
functionality to correlate() which adds these headers from now on.
Update the copyright year on overrides.conf, which was missed in
8a37edd and later commits. All files tracked in this repository now
declare a copyright and refer to the main LICENSE file for licensing
terms.
2020-06-21 13:46:39 +00:00
Jeremy Stanley
62b0ce6d9d Don't use "is" with a literal to test for equality
Solve a SyntaxWarning under Python 3.8 and later for use of the "is"
identity operator when comparing literals, by replacing with the
"==" equality operator.
2020-06-02 14:10:49 +00:00
Jeremy Stanley
28a5c0e1e6 Caching support for URLs with port numbers
When mangling URLs of fetched data to store in the local cache, only
split on the first colon so that URLs with port numbers in them are
properly differentiated. Previously, all URLs for the same domain
name landed in a single file if a port number was included, causing
incorrect results to be returned from the cache.
2020-05-31 15:11:32 +00:00
Jeremy Stanley
74a9ee62f6 Use a dedicated field for cached search timestamps
Fix a cache corruption issue by using a new "cached" field to hold
the timestamp for cached correlation search results. Previously the
"description" field was being overloaded, but this could cause the
cache to no longer load because of duplicate fields.
2020-05-31 00:24:10 +00:00
Jeremy Stanley
5515f756d4 Decode retrieved files as UTF-8 even on Python 2
Python 2.7 is likely the only Python 2 anyone is using any longer
(even that's well past EOL upstream now), and reasonably recent
versions of 2.7 it need the same decode hack as Python 3 anyway when
dealing with some retrieved content. Just get rid of the version
detection and do it under any version.
2020-05-31 00:17:36 +00:00
Jeremy Stanley
fd4b0ae5b2 Add weather zone hkz000 for Hong Kong Observatory
Thanks to Bill Agee for suggesting the Hong Kong Observatory's
weather forecast page. A custom filter is implemented to strip the
forecast text from the HTML page in which it is embedded (if anyone
finds a plaintext version published at an alternate URL, let me know
and I'll rip out the extra routine).
2020-05-31 00:16:07 +00:00
Jeremy Stanley
8e0d7c6e1a Add some fresh overrides
Override a number of active weather stations where searches of
various online sites return names and locations for them which are
not provided by the included sources.
2020-05-24 19:18:35 +00:00
Jeremy Stanley
8a37eddc06 Update correlation sources
Remove the stale metar.tbl and zonecatalog.curr.tar, which the USA
NWS hasn't been updating for many years, and add the public domain
airports.csv file from the amazing ourairports.com community. Also
update to latest (2019) USA Census Bureau location data, March 2020
WX zone information, cooperative sites list from 2018 (latest), and
regenerated active station and zone lists. Loss of the zonecatalog
necessitates directly applying various forecast and alert URL
patterns, though some which appeared unused by NWS for many years
were not included.

Clear out all old overrides, since the vast majority are obsoleted
by refreshed data, and build fresh correlation sets from the above
sources. Basically all sites have switched from HTTP to HTTPS, so
update URLs for this too.
2020-05-24 16:27:58 +00:00
Jeremy Stanley
1ec2848c20 Add FAQ entry about --headers values
Be as clear as possible about what the --headers command-line option
or headers configuration option does, and what sorts of values are
valid for it.
2017-09-16 15:47:03 +00:00
Jeremy Stanley
2a84a53f4a Fix Py3K compatibility for compressed correlation
When run under Python 3.x, explicitly decode decompressed
bytestreams if reading pre-compressed correlation data files.
2017-03-10 15:13:31 +00:00
Jeremy Stanley
915f1b8d7d Update release notes and docs for 2.3 release 2016-11-08 00:03:25 +00:00
Jeremy Stanley
96808c892f Correct NOAA WX weather product URL regression
One piecemeal use of the retired weather.noaa.gov/pub URL was missed
in the correlate() function, causing it to be reintroduced for
zone-based reports (such as forecasts) in a subsequent correlation
dataset update. Correct the invalid URLs in the zones file, and
update the correlation routine to embed the correct and working
tgftp.nws.noaa.gov hostname instead.
2016-11-07 15:54:17 +00:00
Jeremy Stanley
aafdd48e1b Update release notes and docs for 2.2 release 2016-10-05 01:26:54 +00:00
Jeremy Stanley
840b91b4fd Correlation set update
* overrides.conf: Latest source data corrections from
script-assisted research.

These remaining files are generated data. Normally they're not
something I feel good about committing into version control, but in
this case it allows for logging and tracking deltas in the data over
time...

* airports: Removed 18 airports corresponding to nonexistent
stations.

* stations: Removed 326 stations with no recent conditions, added
429.

* zones: Removed 45 zones with no recent forecasts, added 104.

* places, zctas: Based on latest Census Bureau data corrections,
updated with new correlations.

* overrides.log: Record of correlation set build.

* slist, zlist: State of active stations and weather zones at the
time of generation.
2016-10-05 01:17:14 +00:00
Jeremy Stanley
a33dd24ec1 Update correlation logic for 2015 Gazetteer
Simple update to handle new filenames for the 2015 US Census Bureau
Gazetteer. Also update a comment which still had the old NWS station
list URL.
2016-10-05 00:49:32 +00:00
Jeremy Stanley
44546ef04d Correct setpath search order
Short-circuit the outer loop in setpath testing so that we stop
iterating through supplied path elements once a match is found.
2016-09-19 15:25:18 +00:00
Jeremy Stanley
c63284ca35 Fix minor typo in NEWS file
There was an extra "and" in the first sentence of the 2.1 release
prose.
2016-09-13 18:23:51 +00:00
Jeremy Stanley
c2edb3e07f Update release notes and docs for 2.1 release 2016-09-13 17:41:25 +00:00
Jeremy Stanley
e35fbc4d60 Update NOAA WX weather products URLs
Per http://www.wxforum.net/index.php?topic=29502.0 the old
http://weather.noaa.gov/pub site was deprecated and as of August 23
is no longer in service. Update the software and current dataset to
use working http://tgftp.nws.noaa.gov URLs instead.
2016-08-24 22:56:37 +00:00
Jeremy Stanley
92a0869395 Correlation set update
* overrides.conf: Latest source data corrections from
script-assisted research.

These remaining files are generated data. Normally they're not
something I feel good about committing into version control, but in
this case it allows for logging and tracking deltas in the data over
time...

* airports: Removed 527 airports corresponding to nonexistent
stations.

* stations: Removed 176 stations with no recent conditions, added
196.

* zones: Removed 5 zones with no recent forecasts.

* places, zctas: Based on latest Census Bureau data corrections,
updated with new correlations.

* overrides.log: Record of correlation set build.

* slist, zlist: State of active stations and weather zones at the
time of generation.
2014-11-10 22:15:35 +00:00
Jeremy Stanley
562fc1c1df Support more recent data sources
Add support for 2014 Census Bureau data and the newer version of the
NWS COOP stations file.
2014-10-30 00:26:01 +00:00
Jeremy Stanley
49a6ebe760 Document correlation set rebuilding process
* INSTALL: Add a new section documenting the way in which newer
correlation data sets can be rebuilt and substituted for officially
distributed copies.
2014-02-13 01:57:40 +00:00
Jeremy Stanley
676e13b0be Correlation set update
* overrides.conf: Latest source data corrections from
script-assisted research.

These remaining files are generated data. Normally they're not
something I feel good about committing into version control, but in
this case it allows for logging and tracking deltas in the data over
time...

* airports: Removed 42 airports corresponding to nonexistent
stations, added 8.

* stations: Removed 303 stations with no recent conditions, added
403.

* zones: Removed 15 zones with no recent forecasts, added 13.

* places, zctas: Based on latest Census Bureau data corrections,
updated with new correlations.

* overrides.log: Record of correlation set build.

* slist, zlist: State of active stations and weather zones at the
time of generation.
2014-02-13 01:57:20 +00:00
Jeremy Stanley
ddf8f22fe8 Correlation building fixes
* weather.py(correlate): Note the updated URL to Census Bureau data
in file comments, and make the County-Public Forecast Zones
Correlation File parsing more robust against errors in the file
formatting.
2014-02-13 01:10:01 +00:00
Jeremy Stanley
ae2530c01c Add a .gitignore file.
* .gitignore: This is merely for convenience, so that trashfiles from
testing or datafile rebuilds don't make it into the repository.
2012-10-19 22:28:35 +00:00
Jeremy Stanley
be90de0c95 Update data files for rounding adjustment.
* airports, places, stations, zctas, zones: Regenerated from the same
base dataset used in 2.0, but this time with weather.py's updated
correlate function which rounds radian floats to 7 decimal places. No
nodes were added or removed, and the only changes were to take their
coordinate and distance values from sub-nanometer 10^-16 precision to
sub-meter 10^-7, which is still generally at least an order of magnitude
smaller than the base data precision anyway. This should almost entirely
solve any rounding error fuzz in subsequent data file updates.
2012-09-21 01:19:43 +00:00
Jeremy Stanley
185b9eb660 Normalize data override configuration.
* overrides.conf: The data override configuration is now grouped and
alphabetized, so that it can have future updates more easily integrated.
No entries are added or removed in this change.
2012-09-19 01:33:09 +00:00
Jeremy Stanley
f48348794a Rework data override configuration comments.
* overrides.conf: The data override configuration got very large and
unwieldy. In an effort to be able to normalize the content
programmatically, code comments have been replaced by comment
configuration options for each section.
2012-09-19 01:04:34 +00:00
Jeremy Stanley
1c5bbfd74c Truncate radian floats in data files.
* weather.py(correlate): The radian values in data files have a tendency
to vary by the tiniest rounding errors from one Python release to
another. By truncating them to the 7th decimal place, which is still
sub-meter resolution, this problem is minimized and the resulting data
diffs become far less noisy.
2012-09-19 00:58:31 +00:00
Jeremy Stanley
0cfa643cef Update sys.path example in INSTALL.
* INSTALL: The example for checking sys.path was syntactically invalid
for Python 3.x, so it has been fixed to work there as well as relatively
modern 2.x (tested with 2.5 since that's the oldest I had on hand).
2012-09-19 00:42:05 +00:00
Jeremy Stanley
f7fc45b44d Make sure data files have final newlines.
* weather.py(correlate): Previously the airports, places, stations,
zctas and zones files lacked trailing newlines, so this trivial patch
adds them before each is closed for writing.
2012-09-11 00:16:18 +00:00
Jeremy Stanley
e7256def4f 2010 Census U.S. Gazetteer file layout changed.
* weather.py(correlate): The United States Census Bureau altered the
format of their 2010 Gazetteer on August 22, 2012, adding and reordering
a few fields. The previous version of the parser assumed a fixed field
order and ceased to work with the updated data files, so now the order
is inferred from the column headings in the first line of each file
instead.
2012-09-10 03:28:49 +00:00
Jeremy Stanley
13eb635aca Add /etc/weather/weatherrc to config search.
* weather.1(INPUT FILES): Updated the list of potential weatherrc
locations to reflect those mentioned in the INSTALL file, particularly
the addition of /etc/weather/weatherrc in the 2.0 release.

* weather.py(get_config): Adjusted the configuration search locations to
include /etc/weather/weatherrc, since the INSTALL file started
mentioning it in the 2.0 release even though it wasn't actually
implemented as pointed out by Ben Kohler.
2012-08-30 11:13:57 +00:00
Jeremy Stanley
88d6a8444c Make --quiet quieter again.
* weather.py(Selections, guess): The the search cache notification
doesn't belong in terse output, as pointed out by Eric Cooper.
2012-07-12 21:32:13 +00:00
Jeremy Stanley
93f58b4538 Imported from archive.
* Release 2.0: Heavy rewrite with too many new features to enumerate
here in the ChangeLog file.

* NEWS: List of important changes since 1.x releases.

* weather, weather.py: Implemented support for Python 3000 as
requested by ptchinster on behalf of Arch Linux, conditions/forecast
searches by latitude/longitude requested by Brandt Daniels, support
for newer NOAA forecasts pointed out by Darryl Mouck and Richard
Dooling, custom URIs requested by Michel Pelzer, international
weather stations requested by Milton Hubsher, and fixed a metric
conversion issue with negative values reported by Jochen Keil,
Michiel Appelman and Stefan Metzlaff. Thanks to everyone for your
input and assistance!
2012-06-26 00:48:37 +00:00
Jeremy Stanley
4d25a49d5a Imported from archive.
* Release 1.5.

* (all): Updated copyright notices for 2010.

* FAQ, INSTALL, LICENSE, README: Reformatted as ReStructuredText.

* FAQ: Updated to mention alternative sources for NOAA's stations
list, in case the recommended one is unavailable (thanks Celejar!).

* NEWS: Renamed to ChangeLog and refactored into GNU format.

* weather: Added some comment padding between the shebang line and
the copyright, so that distributions wishing to carry patches which
modify the interpreter path don't have to refresh them every year
when the copyright line changes in their context.

* weather, weather.1, weatherrc.5, weather.py: Added experimental
alert, atypes, aurl and zones options to support retrieval,
filtering and formatting of unexpired NWS severe weather advisories.

* weather.1, weatherrc.5: Minor cosmetic fixes to option
descriptions.

* weather.1, weatherrc.5, weather.py: Added imperial and metric
options to filter/convert display units (thanks to Andrew Carter for
this suggestion!).

* weather.py: Fixed a METAR parsing error which would trigger an
IndexError exception if the NWS didn't have a station description on
file (thanks to Celejar for reporting the bug!). Fixed METAR title
line parsing to look for human-readable city and state in the first
line--previous code stopped showing the city name after NWS made
slight format mods. Upped the version to 1.5.

* weatherrc: Additional PIE (Saint Petersburg, FL), PNC (Ponca City,
OK), and PNS (Pensacola, FL) aliases.
2010-03-19 13:30:22 +00:00
Jeremy Stanley
8349654b7c Imported from archive.
* Release 1.4.

* (all): Updated the copyright years for 2008 on some of the files
in the current release and added a copyright statement to any files
previously lacking one.

* LICENSE: Replaced the previous BSD-like license with the one used
by the OpenBSD project (modeled after the Internet Software
Consortium's, a two-clause BSD license removing language made
unnecessary by the Berne convention); this new license is
functionally identical to the old one, just more terse and openly
recognized.

* weather: Clarified function parameters in calls from the wrapper
script to ease future ABI changes in the underlying module.

* weather, weather.py: Some extra comments were added to the source,
indentation style was updated from tab characters to three-space,
and lines longer than 79 columns were refactored or otherwise split.

* weather.1, weather.5, weather.py: Added an flines option to allow
the maximum number of forecast output lines to be shortened. Added
furl and murl options to allow overriding of the default current
conditions and forecast data retrieval URLs. Added a headers option
to allow overriding the default list of header names for current
conditions data filtering. Added a quiet option to suppress the
preamble lines and indentation for both current conditions and
forecast output.

* weather.py: Replaced the hardcoded fallback default METAR station
ID and forecast city/state abbreviation with error messages to
minimize confusion when necessary values are omitted. Adjusted a
couple of hard-coded error message strings to be consistent with the
output format of the option_parser module. Switched from urllib to
urllib2 for retrieving data, providing a simpler means to detect and
report retrieval errors. Upped the version to 1.4.
2008-07-13 07:49:02 +00:00
Jeremy Stanley
eb249a0ae2 Imported from archive.
* Release 1.3.

* FAQ: Update to clarify that specifying an id won't automatically
provide a city and st to get the accompanying forecast.

* weather: Provided a consistent means for relocating weather.py to
a private location; thanks to Mark Tran for pointing out a conflict
with pyweather in ArchLinux (and presumably other distros as well).

* weather.py: Upped the version to 1.3.
2006-07-25 23:00:47 +00:00
Jeremy Stanley
a4375bf577 Imported from archive.
* Release 1.2.

* FAQ, README: Updated for inclsuion of weather-util in Debian.

* weather.py: Upped the version to 1.2.

* weatherrc: Added more default aliases PAO and SJC (requested by
Russ Allbery).
2006-06-30 17:42:14 +00:00
Jeremy Stanley
b755668b64 Imported from archive.
* Release 1.1.

* weather: Switched to "#!/usr/bin/env python" instead for
portability.

* weather.1, weather.5, weather.py: Implemented the --omit-forecast
option to cancel --forecast.

* weather.py: Calling with undefined aliases now throws an error and
exits. Aliases, options and default overrides operate more
logically. Upped the version to 1.1.

* weatherrc: Added 214 standard aliases.
2006-04-18 04:33:21 +00:00
Jeremy Stanley
155d8574df Imported from archive.
* Initial release 1.0.
2006-03-26 17:08:52 +00:00