Added the D.C. blocks download/import.

Created a tiger_lines task initially handling only the D.C. lines.
Added URLs for all of the MD county all-lines shapefiles.

diff --git a/makefile b/makefile
index 13fd41be6c2c0a3b806b1ea65e5a8f40a72ccb97..2ab9dbae7b627e27f927061b3dda062abcfd43b0 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,12 +2,55 @@ DB_NAME=census
 DB_USER=postgres
 TIGER_SRID=4269
 
-# URLs for the TIGER/Line block-level shapefiles.
+# Root folder for the shapefiles.
 TIGER_ROOT=http://www2.census.gov/geo/tiger/TIGER2009
-MD_BLOCKS_URL=$(TIGER_ROOT)/24_MARYLAND/tl_2009_24_tabblock00.zip
-VA_BLOCKS_URL=$(TIGER_ROOT)/51_VIRGINIA/tl_2009_51_tabblock00.zip
-PA_BLOCKS_URL=$(TIGER_ROOT)/42_PENNSYLVANIA/tl_2009_42_tabblock00.zip
-NY_BLOCKS_URL=$(TIGER_ROOT)/36_NEW_YORK/tl_2009_36_tabblock00.zip
+
+# State-specific folders.
+DC_ROOT=$(TIGER_ROOT)/11_DISTRICT_OF_COLUMBIA
+MD_ROOT=$(TIGER_ROOT)/24_MARYLAND
+VA_ROOT=$(TIGER_ROOT)/51_VIRGINIA
+PA_ROOT=$(TIGER_ROOT)/42_PENNSYLVANIA
+NY_ROOT=$(TIGER_ROOT)/36_NEW_YORK
+
+# URLs for the TIGER/Line block-level shapefiles.
+DC_BLOCKS_URL=$(DC_ROOT)/tl_2009_11_tabblock00.zip
+MD_BLOCKS_URL=$(MD_ROOT)/tl_2009_24_tabblock00.zip
+VA_BLOCKS_URL=$(VA_ROOT)/tl_2009_51_tabblock00.zip
+PA_BLOCKS_URL=$(PA_ROOT)/tl_2009_42_tabblock00.zip
+NY_BLOCKS_URL=$(NY_ROOT)/tl_2009_36_tabblock00.zip
+
+# URLs for the DC county all-lines shapefiles.
+# D.C. just has one Census county.
+DC_LINES_URL=$(DC_ROOT)/11001_District_of_Columbia/tl_2009_11001_edges.zip
+
+# This is where it gets ugly.
+#
+# URLs for the MD county all-lines shapefiles.
+ALLEGANY_LINES_URL=$(MD_ROOT)/24001_Allegany_County/tl_2009_24001_edges.zip
+ANNE_ARUNDEL_LINES_URL=$(MD_ROOT)/24003_Anne_Arundel_County/tl_2009_24003_edges.zip
+BALTIMORE_CO_LINES_URL=$(MD_ROOT)/24005_Baltimore_County/tl_2009_24005_edges.zip
+BALTIMORE_CI_LINES_URL=$(MD_ROOT)/24510_Baltimore_city/tl_2009_24510_edges.zip
+CALVERT_LINES_URL=$(MD_ROOT)/24009_Calvert_County/tl_2009_24009_edges.zip
+CAROLINE_LINES_URL=$(MD_ROOT)/24011_Caroline_County/tl_2009_24011_edges.zip
+CARROLL_LINES_URL=$(MD_ROOT)/24013_Carroll_County/tl_2009_24013_edges.zip
+CECIL_LINES_URL=$(MD_ROOT)/24015_Cecil_County/tl_2009_24015_edges.zip
+CHARLES_LINES_URL=$(MD_ROOT)/24017_Charles_County/tl_2009_24017_edges.zip
+DORCHESTER_LINES_URL=$(MD_ROOT)/24019_Dorchester_County/tl_2009_24019_edges.zip
+FREDERICK_LINES_URL=$(MD_ROOT)/24021_Frederick_County/tl_2009_24021_edges.zip
+GARRETT_LINES_URL=$(MD_ROOT)/24023_Garrett_County/tl_2009_24023_edges.zip
+HARFORD_LINES_URL=$(MD_ROOT)/24025_Harford_County/tl_2009_24025_edges.zip
+HOWARD_LINES_URL=$(MD_ROOT)/24027_Howard_County/tl_2009_24027_edges.zip
+KENT_LINES_URL=$(MD_ROOT)/24029_Kent_County/tl_2009_24029_edges.zip
+MONTGOMERY_LINES_URL=$(MD_ROOT)/24031_Montgomery_County/tl_2009_24031_edges.zip
+PRINCE_GEORGES_LINES_URL=$(MD_ROOT)/24033_Prince_Georges_County/tl_2009_24033_edges.zip
+QUEEN_ANNES_LINES_URL=$(MD_ROOT)/24035_Queen_Annes_County/tl_2009_24035_edges.zip
+ST_MARYS_LINES_URL=$(MD_ROOT)/24037_St_Marys_County/tl_2009_24037_edges.zip
+SOMERSET_LINES_URL=$(MD_ROOT)/24039_Somerset_County/tl_2009_24039_edges.zip
+TALBOT_LINES_URL=$(MD_ROOT)/24041_Talbot_County/tl_2009_24041_edges.zip
+WASHINGTON_LINES_URL=$(MD_ROOT)/24043_Washington_County/tl_2009_24043_edges.zip
+WICOMICO_LINES_URL=$(MD_ROOT)/24045_Wicomico_County/tl_2009_24045_edges.zip
+WORCESTER_LINES_URL=$(MD_ROOT)/24047_Worcester_County/tl_2009_24047_edges.zip
+
 
 # Starting with PostGIS 1.4.0, these paths are calculated at install
 # time using the pg_config utility. Rather than try to guess where
@@ -40,9 +83,18 @@ clean:
 # For now, we're only dealing with the Census 2000 Maryland Block
 # data, so the filenames are hard-coded. Easy enough to change.
 #
-data: tiger_blocks
+data: tiger_blocks tiger_lines
 
-tiger_blocks: md_blocks va_blocks pa_blocks ny_blocks
+tiger_blocks: dc_blocks md_blocks va_blocks pa_blocks ny_blocks
+
+dc_blocks:
+       mkdir -p data/census2000/dc/block
+       if [ ! -f data/census2000/dc/block/tl_2009_11_tabblock00.shp ]; \
+       then                                                            \
+               wget -O dcblocks.zip $(DC_BLOCKS_URL);                  \
+               unzip dcblocks.zip -d ./data/census2000/dc/block;       \
+               rm dcblocks.zip;                                        \
+       fi;
 
 md_blocks:
        mkdir -p data/census2000/maryland/block
@@ -81,6 +133,17 @@ ny_blocks:
        fi;
 
 
+tiger_lines: dc_lines
+
+dc_lines:
+       mkdir -p data/census2000/dc/lines
+       if [ ! -f data/census2000/dc/lines/tl_2009_11001_edges.shp ];   \
+       then                                                            \
+               wget -O dclines.zip $(DC_LINES_URL);                    \
+               unzip dclines.zip -d ./data/census2000/dc/lines;        \
+               rm dclines.zip;                                         \
+       fi;
+
 # This task does a couple of things. First, it drops and re-creates
 # the DB_NAME database (or schema, whatever). Then, it adds PL/pgSQL
 # support to the database.
@@ -112,6 +175,15 @@ db: data
              -U $(DB_USER) \
              -f $(PG_SHAREDIR)/contrib/spatial_ref_sys.sql
 
+# D.C. Blocks
+
+       $(PG_BINDIR)/shp2pgsql                                        \
+                 -I                                                  \
+                 -s $(TIGER_SRID)                                    \
+                 -D                                                  \
+                 data/census2000/dc/block/tl_2009_11_tabblock00.shp  \
+                 tiger_blocks                                        \
+                 | psql -U $(DB_USER) -d $(DB_NAME)
 
 # Maryland Blocks