cartodb-importer 0.2.13 → 0.2.14

data/lib/cartodb-importer/importer.rb

@@ -209,6 +209,36 @@ module CartoDB
           end
         end
         
+        #Now, if there is a ltitude and longitude column, lets create a the_geom for it
+        latitude_possible_names = "'latitude','lat','latitudedecimal','latitud','lati'"
+        longitude_possible_names = "'longitude','lon','lng','longitudedecimal','longitud','long'"
+        
+        matching_latitude = nil
+        res = @db_connection["select column_name from information_schema.columns where table_name ='#{@suggested_name}' 
+          and lower(column_name) in (#{latitude_possible_names}) LIMIT 1"]
+        if !res.first.nil?
+          matching_latitude= res.first[:column_name]
+        end
+        matching_longitude = nil
+        res = @db_connection["select column_name from information_schema.columns where table_name ='#{@suggested_name}' 
+          and lower(column_name) in (#{longitude_possible_names}) LIMIT 1"]
+        if !res.first.nil?
+          matching_longitude= res.first[:column_name]
+        end        
+        
+        
+        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("CREATE INDEX \"#{@suggested_name}_the_geom_gist\" ON \"#{@suggested_name}\" USING GIST (the_geom)")
+        end
+        
+        
+        
+        
+        
         @table_created = true
         
         FileUtils.rm_rf(path)
@@ -253,7 +283,7 @@ module CartoDB
             @db_connection.run("ALTER TABLE #{random_table_name} RENAME COLUMN the_geom TO the_geom_orig;")
             geom_type = @db_connection["SELECT GeometryType(the_geom_orig) as type from #{random_table_name} LIMIT 1"].first[:type]
             @db_connection.run("SELECT AddGeometryColumn('#{random_table_name}','the_geom',4326, '#{geom_type}', 2);")
-            @db_connection.run("UPDATE \"#{random_table_name}\" SET the_geom = ST_Transform(the_geom_orig, 4326)")
+            @db_connection.run("UPDATE \"#{random_table_name}\" SET the_geom = ST_Force_2D(ST_Transform(the_geom_orig, 4326))")
             @db_connection.run("ALTER TABLE #{random_table_name} DROP COLUMN the_geom_orig")
             @db_connection.run("CREATE INDEX \"#{random_table_name}_the_geom_gist\" ON \"#{random_table_name}\" USING GIST (the_geom)")
           rescue Exception => msg  

data/lib/cartodb-importer/version.rb

@@ -1,6 +1,6 @@
 module CartoDB
   class Importer
-    VERSION = "0.2.13"
+    VERSION = "0.2.14"
   end
 end
     

data/spec/import_spec.rb

@@ -333,4 +333,41 @@ describe CartoDB::Importer do
       result.import_type.should == '.shp'
     end
   end  
+  
+  describe "Import KML" do
+    it "should import a KML ZIP file" do
+      importer = CartoDB::Importer.new :import_from_file => File.expand_path("../support/data/states.kml.zip", __FILE__),
+                                       :database => "cartodb_importer_test", :username => 'postgres', :password => '',
+                                       :host => 'localhost', :port => 5432
+      result = importer.import!
+      #result.rows_imported.should == 312
+      #result.import_type.should == '.shp'
+    end
+  end  
+  
+  describe "Import CSV with latidude/logitude" do
+    it "should import estaciones2.csv" do
+      importer = CartoDB::Importer.new :import_from_file => File.expand_path("../support/data/walmart.csv", __FILE__),
+                                   :database => "cartodb_importer_test", :username => 'postgres', :password => '',
+                                   :host => 'localhost', :port => 5432, :suggested_name => 'walmart'
+      result = importer.import!
+      result.name.should == 'walmart'
+      #result.rows_imported.should == 30
+      result.import_type.should == '.csv'
+    end
+  end
+  
+  describe "Import CSV with lat/lon" do
+    it "should import estaciones2.csv" do
+      importer = CartoDB::Importer.new :import_from_file => File.expand_path("../support/data/walmart_latlon.csv", __FILE__),
+                                   :database => "cartodb_importer_test", :username => 'postgres', :password => '',
+                                   :host => 'localhost', :port => 5432, :suggested_name => 'walmart_latlon'
+      result = importer.import!
+      result.name.should == 'walmart_latlon'
+      #result.rows_imported.should == 30
+      result.import_type.should == '.csv'
+    end
+  end  
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartodb-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000Z
+date: 2011-10-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70158459012880 !ruby/object:Gem::Requirement
+  requirement: &70348306305600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70158459012880
+  version_requirements: *70348306305600
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70158459012340 !ruby/object:Gem::Requirement
+  requirement: &70348306288700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158459012340
+  version_requirements: *70348306288700
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &70158459011620 !ruby/object:Gem::Requirement
+  requirement: &70348306287760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158459011620
+  version_requirements: *70348306287760
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &70158459010380 !ruby/object:Gem::Requirement
+  requirement: &70348306287120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158459010380
+  version_requirements: *70348306287120
 - !ruby/object:Gem::Dependency
   name: google-spreadsheet-ruby
-  requirement: &70158459009780 !ruby/object:Gem::Requirement
+  requirement: &70348306286400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158459009780
+  version_requirements: *70348306286400
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70158459009140 !ruby/object:Gem::Requirement
+  requirement: &70348306285500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158459009140
+  version_requirements: *70348306285500
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70158459008540 !ruby/object:Gem::Requirement
+  requirement: &70348306284860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70158459008540
+  version_requirements: *70348306284860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70158459007920 !ruby/object:Gem::Requirement
+  requirement: &70348306284240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158459007920
+  version_requirements: *70348306284240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70158459007480 !ruby/object:Gem::Requirement
+  requirement: &70348306283580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158459007480
+  version_requirements: *70348306283580
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70158459007000 !ruby/object:Gem::Requirement
+  requirement: &70348306282880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70158459007000
+  version_requirements: *70348306282880
 description: Import CSV, SHP, and other files with data into a PostgreSQL table
 email:
 - andrew@vizzuality.com