X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=bin%2Fdownload_data;h=da3cb75d38a10503042390dd508ea291dc051f37;hb=eb51c39a919ac83319a6ced262051e6f8b0f00c4;hp=c8a81a442f04a0e46c90a5411a4a298e4425ff7e;hpb=344e78624b343dd3ae89bbcc342f54ded11392d5;p=dead%2Fcensus-tools.git

diff --git a/bin/download_data b/bin/download_data
index c8a81a4..da3cb75 100755
--- a/bin/download_data
+++ b/bin/download_data
@@ -16,16 +16,32 @@ import Data
 from Data import State, County
 
 
-dc = State(11, 'District of Columbia')
-md = State(24, 'Maryland')
-ny = State(36, 'New York')
-pa = State(42, 'Pennsylvania')
-va = State(51, 'Virginia')
+# Create the State objects.
+de = State(10, 'Delaware', 'DE')
+dc = State(11, 'District of Columbia', 'DC')
+md = State(24, 'Maryland', 'MD')
+nj = State(34, 'New Jersey', 'NJ')
+ny = State(36, 'New York', 'NY')
+pa = State(42, 'Pennsylvania', 'PA')
+va = State(51, 'Virginia', 'VA')
+wv = State(54, 'West Virginia', 'WV')
+
+
+# Now we add all of the counties belonging to each state, starting
+# with Delaware.
+
+de.add_county(1, 'Kent')
+de.add_county(3, 'New Castle')
+de.add_county(5, 'Sussex')
+
 
 # Washington D.C.
+
 dc.add_county(1, 'District of Columbia', True)
 
+
 # Maryland
+
 md.add_county(1, 'Allegany')
 md.add_county(3, 'Anne Arundel')
 md.add_county(5, 'Baltimore')
@@ -51,7 +67,34 @@ md.add_county(43, 'Washington')
 md.add_county(45, 'Wicomico')
 md.add_county(47, 'Worcester')
 
+
+# New Jersey
+
+nj.add_county(1, 'Atlantic')
+nj.add_county(3, 'Bergen')
+nj.add_county(5, 'Burlington')
+nj.add_county(7, 'Camden')
+nj.add_county(9, 'Cape May')
+nj.add_county(11, 'Cumberland')
+nj.add_county(13, 'Essex')
+nj.add_county(15, 'Gloucester')
+nj.add_county(17, 'Hudson')
+nj.add_county(19, 'Hunterdon')
+nj.add_county(21, 'Mercer')
+nj.add_county(23, 'Middlesex')
+nj.add_county(25, 'Monmouth')
+nj.add_county(27, 'Morris')
+nj.add_county(29, 'Ocean')
+nj.add_county(31, 'Passaic')
+nj.add_county(33, 'Salem')
+nj.add_county(35, 'Somerset')
+nj.add_county(37, 'Sussex')
+nj.add_county(39, 'Union')
+nj.add_county(41, 'Warren')
+
+
 # New York
+
 ny.add_county(1, 'Albany')
 ny.add_county(3, 'Allegany')
 ny.add_county(5, 'Bronx')
@@ -117,6 +160,7 @@ ny.add_county(123, 'Yates')
 
 
 # Pennsylvania
+
 pa.add_county(1, 'Adams')
 pa.add_county(3, 'Allegheny')
 pa.add_county(5, 'Armstrong')
@@ -185,6 +229,9 @@ pa.add_county(129, 'Westmoreland')
 pa.add_county(131, 'Wyoming')
 pa.add_county(133, 'York')
 
+
+# Virginia
+
 va.add_county(1, 'Accomack')
 va.add_county(3, 'Albemarle')
 va.add_county(5, 'Alleghany')
@@ -321,6 +368,68 @@ va.add_county(830, 'Williamsburg city', True)
 va.add_county(840, 'Winchester city', True)
 
 
-states = [dc, md, ny, pa, va]
+# West Virginia
+
+wv.add_county(1, 'Barbour')
+wv.add_county(3, 'Berkeley')
+wv.add_county(5, 'Boone')
+wv.add_county(7, 'Braxton')
+wv.add_county(9, 'Brooke')
+wv.add_county(11, 'Cabell')
+wv.add_county(13, 'Calhoun')
+wv.add_county(15, 'Clay')
+wv.add_county(17, 'Doddridge')
+wv.add_county(19, 'Fayette')
+wv.add_county(21, 'Gilmer')
+wv.add_county(23, 'Grant')
+wv.add_county(25, 'Greenbrier')
+wv.add_county(27, 'Hampshire')
+wv.add_county(29, 'Hancock')
+wv.add_county(31, 'Hardy')
+wv.add_county(33, 'Harrison')
+wv.add_county(35, 'Jackson')
+wv.add_county(37, 'Jefferson')
+wv.add_county(39, 'Kanawha')
+wv.add_county(41, 'Lewis')
+wv.add_county(43, 'Lincoln')
+wv.add_county(45, 'Logan')
+wv.add_county(47, 'McDowell')
+wv.add_county(49, 'Marion')
+wv.add_county(51, 'Marshall')
+wv.add_county(53, 'Mason')
+wv.add_county(55, 'Mercer')
+wv.add_county(57, 'Mineral')
+wv.add_county(59, 'Mingo')
+wv.add_county(61, 'Monongalia')
+wv.add_county(63, 'Monroe')
+wv.add_county(65, 'Morgan')
+wv.add_county(67, 'Nicholas')
+wv.add_county(69, 'Ohio')
+wv.add_county(71, 'Pendleton')
+wv.add_county(73, 'Pleasants')
+wv.add_county(75, 'Pocahontas')
+wv.add_county(77, 'Preston')
+wv.add_county(79, 'Putnam')
+wv.add_county(81, 'Raleigh')
+wv.add_county(83, 'Randolph')
+wv.add_county(85, 'Ritchie')
+wv.add_county(87, 'Roane')
+wv.add_county(89, 'Summers')
+wv.add_county(91, 'Taylor')
+wv.add_county(93, 'Tucker')
+wv.add_county(95, 'Tyler')
+wv.add_county(97, 'Upshur')
+wv.add_county(99, 'Wayne')
+wv.add_county(101, 'Webster')
+wv.add_county(103, 'Wetzel')
+wv.add_county(105, 'Wirt')
+wv.add_county(107, 'Wood')
+wv.add_county(109, 'Wyoming')
+
 
+# Now that the counties have been added, create a list of states to
+# pass to the download_lines function.
+states = [de, dc, md, nj, ny, pa, va, wv]
+Data.download_sf1(states)
+Data.download_blocks(states)
 Data.download_lines(states)