From a33dd24ec1503c62f10587709e9b9a260972626b Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 5 Oct 2016 00:49:32 +0000 Subject: [PATCH] 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. --- weather.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/weather.py b/weather.py index d00f7ff..7d07e91 100644 --- a/weather.py +++ b/weather.py @@ -1198,14 +1198,14 @@ def correlate(): import codecs, datetime, hashlib, os, re, sys, tarfile, time, zipfile if pyversion("3"): import configparser else: import ConfigParser as configparser - gcounties_an = "2014_Gaz_counties_national.zip" - gcounties_fn = "2014_Gaz_counties_national.txt" - gcousubs_an = "2014_Gaz_cousubs_national.zip" - gcousubs_fn = "2014_Gaz_cousubs_national.txt" - gplace_an = "2014_Gaz_place_national.zip" - gplace_fn = "2014_Gaz_place_national.txt" - gzcta_an = "2014_Gaz_zcta_national.zip" - gzcta_fn = "2014_Gaz_zcta_national.txt" + gcounties_an = "2015_Gaz_counties_national.zip" + gcounties_fn = "2015_Gaz_counties_national.txt" + gcousubs_an = "2015_Gaz_cousubs_national.zip" + gcousubs_fn = "2015_Gaz_cousubs_national.txt" + gplace_an = "2015_Gaz_place_national.zip" + gplace_fn = "2015_Gaz_place_national.txt" + gzcta_an = "2015_Gaz_zcta_national.zip" + gzcta_fn = "2015_Gaz_zcta_national.txt" for filename in os.listdir("."): if re.match("bp[0-9][0-9][a-z][a-z][0-9][0-9].dbx$", filename): cpfzcf_fn = filename @@ -1228,7 +1228,7 @@ def correlate(): %s # generated by %s on %s from these public domain sources: # -# http://www.census.gov/geo/maps-data/data/gazetteer2014.html +# http://www.census.gov/geo/maps-data/data/gazetteer2015.html # %s %s %s # %s %s %s # %s %s %s @@ -1237,7 +1237,7 @@ def correlate(): # http://www.weather.gov/geodata/catalog/wsom/html/cntyzone.htm # %s %s %s # -# http://weather.noaa.gov/data/nsd_cccc.txt +# http://tgftp.nws.noaa.gov/data/nsd_cccc.txt # %s %s %s # # http://tgftp.nws.noaa.gov/data/zonecatalog.curr.tar -- 2.11.0