Salastil/weather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update correlation logic for 2015 Gazetteer

Browse Source 
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.
This commit is contained in:
Jeremy Stanley
2016-10-05 00:49:32 +00:00
parent 44546ef04d
commit a33dd24ec1
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
weather.py
View File

@@ -1198,14 +1198,14 @@ def correlate():
import codecs, datetime, hashlib, os, re, sys, tarfile, time, zipfile import codecs, datetime, hashlib, os, re, sys, tarfile, time, zipfile
if pyversion("3"): import configparser if pyversion("3"): import configparser
else: import ConfigParser as configparser else: import ConfigParser as configparser
gcounties_an = "2014_Gaz_counties_national.zip" gcounties_an = "2015_Gaz_counties_national.zip"
gcounties_fn = "2014_Gaz_counties_national.txt" gcounties_fn = "2015_Gaz_counties_national.txt"
gcousubs_an = "2014_Gaz_cousubs_national.zip" gcousubs_an = "2015_Gaz_cousubs_national.zip"
gcousubs_fn = "2014_Gaz_cousubs_national.txt" gcousubs_fn = "2015_Gaz_cousubs_national.txt"
gplace_an = "2014_Gaz_place_national.zip" gplace_an = "2015_Gaz_place_national.zip"
gplace_fn = "2014_Gaz_place_national.txt" gplace_fn = "2015_Gaz_place_national.txt"
gzcta_an = "2014_Gaz_zcta_national.zip" gzcta_an = "2015_Gaz_zcta_national.zip"
gzcta_fn = "2014_Gaz_zcta_national.txt" gzcta_fn = "2015_Gaz_zcta_national.txt"
for filename in os.listdir("."): for filename in os.listdir("."):
if re.match("bp[0-9][0-9][a-z][a-z][0-9][0-9].dbx$", filename): if re.match("bp[0-9][0-9][a-z][a-z][0-9][0-9].dbx$", filename):
cpfzcf_fn = filename cpfzcf_fn = filename
@@ -1228,7 +1228,7 @@ def correlate():
%s %s
# generated by %s on %s from these public domain sources: # 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 # %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 # http://www.weather.gov/geodata/catalog/wsom/html/cntyzone.htm
# %s %s %s # %s %s %s
# #
# http://weather.noaa.gov/data/nsd_cccc.txt # http://tgftp.nws.noaa.gov/data/nsd_cccc.txt
# %s %s %s # %s %s %s
# #
# http://tgftp.nws.noaa.gov/data/zonecatalog.curr.tar # http://tgftp.nws.noaa.gov/data/zonecatalog.curr.tar