@@ -8,4 +8,4 @@ ARGV[1..ARGV.length].each do |path| db.import_tree path end db.log "creating index" -db.create_index +#db.create_index bin/tiger_import @@ -47,14 +47,14 @@ class Geocoder::US::Import < Geocoder::US::Database def load_features (file) dataset = GeoRuby::Shp4r::ShpFile.open(file) - fields = dataset.fields + fields = dataset.fields.map {|f| f.name} dataset.each do |record| - attrs = record.data.values_at(fields) + attrs = fields.map {|f| record.data[f]} geom = record.geometry geom = geom.geometries[0] \ if geom.kind_of? GeoRuby::SimpleFeatures::GeometryCollection - points = geom.points.map {|x| (x*1_000_000).to_i} - coords = points.pack("V*") + points = geom.points.map {|pt| [pt.x, pt.y].map {|i| (i*1000000).to_i}} + coords = points.flatten.pack("V*") yield attrs, coords end end @@ -75,6 +75,17 @@ class Geocoder::US::Import < Geocoder::US::Database end end + def insert_dbf (file, table) + st = nil + GeoRuby::Shp4r::Dbf::Reader.open(file) do |dbf| + fields = dbf.fields.map {|f| f.name} + dbf.rows.each do |record| + attrs = fields.map {|f| record[f]} + insert_data st, table, attrs + end + end + end + def insert_csv (file, table, delimiter="|") st = nil File.open(file).readlines.each do |line| @@ -111,10 +122,13 @@ class Geocoder::US::Import < Geocoder::US::Database unpack_zip zipfile, tmpdir basename = File.join(tmpdir, File.basename(zipfile))[0..-5] shpfile = basename + ".shp" - shpfile = basename + ".dbf" unless File.exists? shpfile + dbffile = basename + ".dbf" if File.exists? shpfile log "#{table} " insert_shapefile shpfile, table + elsif File.exists? dbffile + log "#{table} " + insert_dbf dbffile, table else log "\nNOT FOUND: #{shpfile}\n" end lib/geocoder/us/import.rb @@ -7,7 +7,7 @@ class Geocoder::US::Import::TIGER < Geocoder::US::Import def post_create log "importing places" @db.transaction do - insert_csv File.join(@sqlpath, "place.csv"), "place" + # insert_csv File.join(@sqlpath, "place.csv"), "place" end end end lib/geocoder/us/import/tiger.rb e9b76a85001d63145f6743cc8a6ad2e338373148 Schuyler Erle sderle@goldman.(none) http://github.com/geocommons/geocoder/commit/61a1b77e2c1dbf17596b15071ea2fad70c44c544 61a1b77e2c1dbf17596b15071ea2fad70c44c544 2009-08-04T13:18:31-07:00 2009-08-04T13:18:31-07:00 Debug GeoRuby import. 0a3d463f9010f73684be4d29124ca5dd0fddfe50 Schuyler Erle sderle@goldman.(none)