X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=bin%2Fblocks2kml;h=741299197999c7d162931bec1b031656087f63f7;hb=ab15720bbb1903a574aefdb6c7e9b635ea877e15;hp=bef23fa4393b8a40e2e596bd0a554ec8b88f64b5;hpb=c7072bed9da48e659ffd023e7b974d5335297f44;p=dead%2Fcensus-tools.git

diff --git a/bin/blocks2kml b/bin/blocks2kml
index bef23fa..7412991 100755
--- a/bin/blocks2kml
+++ b/bin/blocks2kml
@@ -33,7 +33,7 @@ to stdout.
 parser = CLI.default_option_parser()
 
 # Use this module's docstring as the description.
-parser.description = __doc__.strip()
+parser.description = __doc__
 (options, args) = parser.parse_args()
 
 
@@ -78,7 +78,7 @@ cursor = conn.cursor()
 
 avg_avg_pop_query = """
 SELECT AVG(population_density)
-FROM sf1_blocks
+FROM blocks
 WHERE population_density > 0.005;
 """
 
@@ -88,7 +88,7 @@ avg_avg_population = float(rows[0][0])
 
 stddev_avg_pop_query = """
 SELECT stddev_samp(population_density)
-FROM sf1_blocks
+FROM blocks
 WHERE population_density > 0.005;
 """
 
@@ -111,9 +111,8 @@ for style in red_styles:
 
 
 query = """
-SELECT tiger_blocks.blkidfp00, population_density, AsKML(the_geom) as geom
-       FROM (sf1_blocks INNER JOIN tiger_blocks
-             ON sf1_blocks.blkidfp00 = tiger_blocks.blkidfp00);
+SELECT blkidfp00, population_density, AsKML(the_geom) as geom
+       FROM blocks;
 """
 
 cursor.execute(query)