cartodb-importer 0.2.3 → 0.2.4

data/cartodb-importer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_runtime_dependency "pg", '~> 0.11'
+  s.add_runtime_dependency "pg", "0.11"
   s.add_runtime_dependency "sequel"
   s.add_runtime_dependency "roo"
   s.add_runtime_dependency "spreadsheet"

data/lib/cartodb-importer/importer.rb

@@ -148,18 +148,25 @@ module CartoDB
         port = @db_configuration[:port] ? "-p #{@db_configuration[:port]}" : ""
         @suggested_name = get_valid_name(File.basename(path).tr('.','_').downcase.sanitize) unless @force_name
         random_table_name = "importing_#{Time.now.to_i}_#{@suggested_name}"
-
+        
         normalizer_command = "#{python_bin_path} -Wignore #{File.expand_path("../../../misc/shp_normalizer.py", __FILE__)} #{path} #{random_table_name}"
-        shp_args_command = `#{normalizer_command}` 
-        if shp_args_command.strip.blank?
+        shp_args_command = `#{normalizer_command}`.split( /, */, 4 )
+
+        #print "-e -i -I -g the_geom -W %s %s %s %s" %(srid,encoding,shp_file,name,flag)
+
+        if shp_args_command.length != 4
         raise "Error running python shp_normalizer script: #{normalizer_command}"
         end
-        full_shp_command = "#{shp2pgsql_bin_path} #{shp_args_command.strip} | #{psql_bin_path} #{host} #{port} -U #{@db_configuration[:username]} -w -d #{@db_configuration[:database]}"
+        full_shp_command = "#{shp2pgsql_bin_path} -s #{shp_args_command[0]} -e -i -I -g the_geom -W #{shp_args_command[1]} #{shp_args_command[2]} #{shp_args_command[3].strip} | #{psql_bin_path} #{host} #{port} -U #{@db_configuration[:username]} -w -d #{@db_configuration[:database]}"
         log "Running shp2pgsql: #{full_shp_command}"
         %x[#{full_shp_command}]
-
+        if shp_args_command[1] != '4326'
+          
+          @db_connection.run("SELECT UpdateGeometrySRID('#{random_table_name}', 'the_geom', 4326)")
+          @db_connection.run("UPDATE #{random_table_name} SET the_geom = ST_Transform(the_geom, 4326)")
+        end
         @db_connection.run("CREATE TABLE #{@suggested_name} AS SELECT * FROM #{random_table_name}")
-        #@db_connection.run("DROP TABLE #{random_table_name}")
+        @db_connection.run("DROP TABLE #{random_table_name}")
         @table_created = true
         
         entries.each{ |e| FileUtils.rm_rf(e) } if entries.any?

data/lib/cartodb-importer/version.rb

@@ -1,6 +1,6 @@
 module CartoDB
   class Importer
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end
     

data/misc/shp_normalizer.py

@@ -15,6 +15,7 @@ name = sys.argv[2]
 dbf_file = shp_file[0:-4] + '.dbf'
 prj_file = shp_file[0:-4] + '.prj'
 
+srid = 4326
 #Try detecting the SRID
 if os.path.isfile(prj_file):
   prj_filef = open(prj_file, 'r')
@@ -37,7 +38,7 @@ if os.path.isfile(prj_file):
     jres = json.loads(webres.read())
     if jres['codes']:
       srid = int(jres['codes'][0]['code'])
-
+    
 #Try to detect the encoding
 dbf = open(dbf_file, 'rb')
 db = dbfUtils.dbfreader(dbf)
@@ -53,4 +54,4 @@ encoding = detector.result["encoding"]
 if encoding=="ascii":
     encoding="LATIN1"
 
-print " -r %s -s 4326 -e -i -I -g the_geom -W %s %s %s" %(srid,encoding,shp_file,name)
+print "%s,%s,%s,%s" % (srid,encoding,shp_file,name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartodb-importer
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-09-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70326945028900 !ruby/object:Gem::Requirement
+  requirement: &70174363629800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70326945028900
+  version_requirements: *70174363629800
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70326945028480 !ruby/object:Gem::Requirement
+  requirement: &70174363629380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326945028480
+  version_requirements: *70174363629380
 - !ruby/object:Gem::Dependency
   name: roo
-  requirement: &70326945028020 !ruby/object:Gem::Requirement
+  requirement: &70174363628920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326945028020
+  version_requirements: *70174363628920
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &70326945027600 !ruby/object:Gem::Requirement
+  requirement: &70174363628500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326945027600
+  version_requirements: *70174363628500
 - !ruby/object:Gem::Dependency
   name: google-spreadsheet-ruby
-  requirement: &70326945027180 !ruby/object:Gem::Requirement
+  requirement: &70174363628080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326945027180
+  version_requirements: *70174363628080
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70326945026760 !ruby/object:Gem::Requirement
+  requirement: &70174363627660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326945026760
+  version_requirements: *70174363627660
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70326945026340 !ruby/object:Gem::Requirement
+  requirement: &70174363627240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326945026340
+  version_requirements: *70174363627240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70326945025920 !ruby/object:Gem::Requirement
+  requirement: &70174363626820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326945025920
+  version_requirements: *70174363626820
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70326945025500 !ruby/object:Gem::Requirement
+  requirement: &70174363626400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326945025500
+  version_requirements: *70174363626400
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70326945025080 !ruby/object:Gem::Requirement
+  requirement: &70174363625980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326945025080
+  version_requirements: *70174363625980
 description: Import CSV, SHP, and other files with data into a PostgreSQL table
 email:
 - andrew@vizzuality.com