cartodb-importer 0.2.16 → 0.2.17

data/lib/cartodb-importer/importer.rb

@@ -276,8 +276,19 @@ module CartoDB
           if matching_latitude and matching_longitude
               #we know there is a latitude/longitude columns
               @db_connection.run("SELECT AddGeometryColumn('#{@suggested_name}','the_geom',4326, 'POINT', 2);")
-              @db_connection.run("UPDATE \"#{@suggested_name}\" SET the_geom = ST_GeomFromText('POINT('|| \"#{matching_longitude}\" ||' '|| \"#{matching_latitude}\" ||')',4326)
-                WHERE \"#{matching_longitude}\" IS NOT NULL AND \"#{matching_latitude}\" IS NOT NULL AND \"#{matching_longitude}\"<>'' AND \"#{matching_latitude}\"<>''")
+              
+              @db_connection.run(<<-GEOREF
+              UPDATE \"#{@suggested_name}\" 
+              SET the_geom = 
+                ST_GeomFromText(
+                  'POINT(' || \"#{matching_longitude}\" || ' ' || \"#{matching_latitude}\" || ')', 4326
+              ) 
+              WHERE 
+              CAST(\"#{matching_longitude}\" AS text) ~ '^(([-+]?(([0-9]|[1-9][0-9]|1[0-7][0-9])(\.[0-9]+)?))|[-+]?180)$' 
+              AND   
+              CAST(\"#{matching_latitude}\" AS text)  ~ '^(([-+]?(([0-9]|[1-8][0-9])(\.[0-9]+)?))|[-+]?90)$'
+              GEOREF
+              )
               @db_connection.run("CREATE INDEX \"#{@suggested_name}_the_geom_gist\" ON \"#{@suggested_name}\" USING GIST (the_geom)")
           end
         end

data/lib/cartodb-importer/version.rb

@@ -1,6 +1,6 @@
 module CartoDB
   class Importer
-    VERSION = "0.2.16"
+    VERSION = "0.2.17"
   end
 end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartodb-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-04 00:00:00.000000000Z
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70113643297840 !ruby/object:Gem::Requirement
+  requirement: &70363733332580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70113643297840
+  version_requirements: *70363733332580
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70113643296820 !ruby/object:Gem::Requirement
+  requirement: &70363733331740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 3.28.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113643296820
+  version_requirements: *70363733331740
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &70113643295980 !ruby/object:Gem::Requirement
+  requirement: &70363733331020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: 1.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *70113643295980
+  version_requirements: *70363733331020
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &70113643292540 !ruby/object:Gem::Requirement
+  requirement: &70363733330320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: 0.6.5.9
   type: :runtime
   prerelease: false
-  version_requirements: *70113643292540
+  version_requirements: *70363733330320
 - !ruby/object:Gem::Dependency
   name: google-spreadsheet-ruby
-  requirement: &70113643291600 !ruby/object:Gem::Requirement
+  requirement: &70363733329560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70113643291600
+  version_requirements: *70363733329560
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70113643290720 !ruby/object:Gem::Requirement
+  requirement: &70363733328960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70113643290720
+  version_requirements: *70363733328960
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70113643289920 !ruby/object:Gem::Requirement
+  requirement: &70363733328360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113643289920
+  version_requirements: *70363733328360
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &70113643288440 !ruby/object:Gem::Requirement
+  requirement: &70363733327540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70113643288440
+  version_requirements: *70363733327540
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &70113643287060 !ruby/object:Gem::Requirement
+  requirement: &70363733326760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70113643287060
+  version_requirements: *70363733326760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70113643285860 !ruby/object:Gem::Requirement
+  requirement: &70363733326080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70113643285860
+  version_requirements: *70363733326080
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70113643273800 !ruby/object:Gem::Requirement
+  requirement: &70363733325400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70113643273800
+  version_requirements: *70363733325400
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70113643272620 !ruby/object:Gem::Requirement
+  requirement: &70363733324700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,7 +145,7 @@ dependencies:
         version: 0.11.6
   type: :development
   prerelease: false
-  version_requirements: *70113643272620
+  version_requirements: *70363733324700
 description: Import CSV, SHP, and other files with data into a PostgreSQL table
 email:
 - andrew@vizzuality.com