geonames_local 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/geonames_local.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geonames_local}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-01-29}
+  s.date = %q{2010-01-30}
   s.default_executable = %q{geonames}
   s.description = %q{Dump and feed a tokyo cabinet for local geonames search}
   s.email = %q{x@nofxx.com}
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "bin/geonames",
-     "geonames.yml",
      "geonames_local.gemspec",
      "lib/config/codes.yml",
      "lib/config/geonames.yml",

data/lib/data/shp.rb

@@ -11,9 +11,9 @@ module Geonames
       @type = Object.module_eval("::#{Opt[:type].capitalize}", __FILE__, __LINE__)
       @ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
       @sample = nil
-      shp2pg if file
-      parse if file
-      write if file
+      if file
+        shp2pg; parse; write
+      end
     end
 
     def shp2pg

data/lib/features/road.rb

@@ -13,15 +13,18 @@ class Road
     @name = r[:name]
     @zone = r[:zone]
     kind  = r[:kind] || @name.split(" ")[0]
+    @geom = parse_geom(r[:geom])
     @kind = parse_kind(kind)
     @city = city
     @country = country
-    parse_geom(r[:geom])
     @table = :roads
   end
 
   def parse_geom(hex)
-    @geom = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(hex)
+    if hex =~ /^SRID/ # PG 8.3 support
+      hex = hex.split(";")[1]
+    end
+    GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(hex)
   end
 
   def geom=(g)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: geonames_local
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 -02:00
+date: 2010-01-30 00:00:00 -02:00
 default_executable: geonames
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,7 +49,6 @@ files:
 - Rakefile
 - VERSION
 - bin/geonames
-- geonames.yml
 - geonames_local.gemspec
 - lib/config/codes.yml
 - lib/config/geonames.yml

data/geonames.yml

@@ -1,14 +0,0 @@
-#
-# Geonames Local Config Example
-#
-:store: pg
-:codes: [br]
-:level: city
-:mapping:
-  :name: name
-  :geom: true
-:db:
-  :host: localhost
-  :dbname: rtrac_development
-  :user: nofxx
-  :password: