cartodb-importer 0.2.18 → 0.2.19

data/lib/cartodb-importer/gpx.rb

@@ -0,0 +1,29 @@
+
+
+module CartoDB
+  # class to get the point number in GPX files
+  class GPX
+
+    def initialize(filename) 
+      @filename = filename
+      @ogr2ogr_bin_path = `which ogr2ogr`.strip
+    end
+
+    def _points_for(table) 
+      cmd = "#{@ogr2ogr_bin_path} -f CSV /vsistdout/ #{@filename} -sql 'select count(*) from #{table}'"
+      #RUBY WAY
+      `#{cmd}`.strip.split[1].to_i
+    end
+
+    def track_points
+      _points_for('track_points')
+    end
+
+    def route_points
+      _points_for('route_points')
+    end
+
+  end
+end
+  
+

data/lib/cartodb-importer/importer.rb

@@ -1,5 +1,8 @@
 # coding: UTF-8
 #
+
+require File.dirname(__FILE__) + '/gpx'
+
 def get_temporal_filename (prefix)
   tf = Tempfile.new(prefix)
   tempname = tf.path 
@@ -154,16 +157,26 @@ module CartoDB
         ogr2ogr_command = %Q{#{ogr2ogr_bin_path} -fieldTypeToString DateTime -f "ESRI Shapefile" #{shp_file} #{path}}
         out = `#{ogr2ogr_command}`
 
-        track_points = "#{shp_file}/track_points.shp"
-        runlog.stdout << track_points
-        # then choose the track_points file to import
-        if Dir.exists?(shp_file) and File.file?(track_points)
+        # GPX files has 3 interesting "tables", route points, track_points and way_points
+        # this importer tries to imprt track_points first, if thereis no points, route_points
+        # is imported
+        gpx = CartoDB::GPX.new path
+        if gpx.track_points > 0
+          points = "#{shp_file}/track_points.shp"
+        elsif gpx.route_points > 0
+          points = "#{shp_file}/route_points.shp"
+        else 
+          points = "#{shp_file}/waypoints.shp"
+        end
+        runlog.stdout << points
+        # then choose the points file to import
+        if Dir.exists?(shp_file) and File.file?(points)
           # add all files to entries to be removed
           # add the path too in order to remove it 
           entries = Dir["#{shp_file}/*"]
           entries << shp_file
 
-          path = track_points
+          path = points
           # get the file to import and set extension to shp
           @ext = '.shp'
         else

data/lib/cartodb-importer/version.rb

@@ -1,6 +1,6 @@
 module CartoDB
   class Importer
-    VERSION = "0.2.18"
+    VERSION = "0.2.19"
   end
 end
     

data/spec/gpx_spec.rb

@@ -0,0 +1,26 @@
+
+require 'spec_helper'
+require File.expand_path("../../lib/cartodb-importer/gpx", __FILE__)
+
+
+describe CartoDB::GPX do
+  it "should return the track point number in file" do
+    gpx = CartoDB::GPX.new (File.expand_path("../support/data/route2.gpx", __FILE__))
+    gpx.track_points.should == 822
+  end
+  it "should return the route point number in file" do
+    gpx = CartoDB::GPX.new (File.expand_path("../support/data/route2.gpx", __FILE__))
+    gpx.route_points.should == 0
+  end
+
+  it "should return the track point number in file whiout track_points" do
+    gpx = CartoDB::GPX.new (File.expand_path("../support/data/ex.gpx", __FILE__))
+    gpx.track_points.should == 0
+  end
+
+  it "should return the route point number in file whit only route points" do
+    gpx = CartoDB::GPX.new (File.expand_path("../support/data/ex.gpx", __FILE__))
+    gpx.route_points.should == 46
+  end
+end
+

data/spec/import_spec.rb

@@ -333,7 +333,17 @@ describe CartoDB::Importer do
         result = importer.import!
         result.should_not == nil
         result.name.should == 'route2'
-        #result.rows_imported.should == 29
+        result.rows_imported.should == 822
+        result.import_type.should == '.gpx'
+      end
+      it "should import GPX file whiout track_points" do
+        importer = CartoDB::Importer.new :import_from_file => File.expand_path("../support/data/ex.gpx", __FILE__),
+                                       :database => "cartodb_importer_test", :username => 'postgres', :password => '',
+                                       :host => 'localhost', :port => 5432
+        result = importer.import!
+        result.should_not == nil
+        result.name.should == 'ex'
+        result.rows_imported.should == 46
         result.import_type.should == '.gpx'
       end
   end

metadata

@@ -1,10 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cartodb-importer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.19
   prerelease: 
-  version: 0.2.18
 platform: ruby
-authors: 
+authors:
 - Fernando Blat
 - Andrew Hill
 - Javier de la Torre
@@ -12,152 +12,147 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-19 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pg
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70735990 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.11"
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sequel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70735990
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: &70735570 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.28.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: roo
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70735570
+- !ruby/object:Gem::Dependency
+  name: roo
+  requirement: &70735120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.9.7
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: spreadsheet
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70735120
+- !ruby/object:Gem::Dependency
+  name: spreadsheet
+  requirement: &70734620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.5.9
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: google-spreadsheet-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70734620
+- !ruby/object:Gem::Dependency
+  name: google-spreadsheet-ruby
+  requirement: &70733970 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70733970
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &70733530 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70733530
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70733160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rgeo
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70733160
+- !ruby/object:Gem::Dependency
+  name: rgeo
+  requirement: &70732740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rgeo-geojson
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70732740
+- !ruby/object:Gem::Dependency
+  name: rgeo-geojson
+  requirement: &70732330 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70732330
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70732040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70732040
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70731730 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.10.0
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70731730
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &70731440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.11.6
   type: :development
-  version_requirements: *id012
+  prerelease: false
+  version_requirements: *70731440
 description: Import CSV, SHP, and other files with data into a PostgreSQL table
-email: 
+email:
 - andrew@vizzuality.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -169,6 +164,7 @@ files:
 - lib/cartodb-exporter/exporter.rb
 - lib/cartodb-exporter/version.rb
 - lib/cartodb-importer.rb
+- lib/cartodb-importer/gpx.rb
 - lib/cartodb-importer/importer.rb
 - lib/cartodb-importer/version.rb
 - lib/core_ext/.DS_Store
@@ -180,37 +176,31 @@ files:
 - misc/shp_normalizer.py
 - misc/srid_from_gdal.py
 - spec/export_spec.rb
+- spec/gpx_spec.rb
 - spec/import_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: cartodb-importer
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Import CSV, SHP, and other files with data into a PostgreSQL table
-test_files: 
-- spec/export_spec.rb
-- spec/import_spec.rb
-- spec/spec_helper.rb
+test_files: []