nofxx-georuby 1.6.1 → 1.6.2

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/georuby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{georuby}
-  s.version = "1.6.1"
+  s.version = "1.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Guilhem Vellut", "Marcos Augusto"]

data/lib/geo_ruby/gpx4r/gpx.rb

@@ -11,13 +11,14 @@ module GeoRuby
       include Enumerable
 
       # Opens a GPX file. Both "abc.shp" and "abc" are accepted.
-      def initialize(file, with_z = true, with_m = true)
+      def initialize(file, *opts) #with_z = true, with_m = true)
         @file_root = file.gsub(/\.gpx$/i,"")
         raise MalformedGpxException.new("Missing GPX File") unless
           File.exists? @file_root + ".gpx"
         @points, @envelope = [], nil
         @gpx = File.open(@file_root + ".gpx", "rb")
-        parse_file
+        opt = opts.inject({}) { |o, h| h.merge(o) }
+        parse_file(opt[:with_z], opt[:with_m])
       end
 
       #force the reopening of the files compsing the shp. Close before calling this.
@@ -26,8 +27,8 @@ module GeoRuby
       end
 
       #opens a GPX "file". If a block is given, the GpxFile object is yielded to it and is closed upon return. Else a call to <tt>open</tt> is equivalent to <tt>GpxFile.new(...)</tt>.
-      def self.open(file)
-        gpxfile = GpxFile.new(file)
+      def self.open(file, *opts)
+        gpxfile = GpxFile.new(file, *opts)
         if block_given?
           yield gpxfile
           gpxfile.close
@@ -91,12 +92,13 @@ module GeoRuby
       # wpt => waypoint => TODO?
       # rte(pt) => route
       # trk(pt) => track /
-      def parse_file(parse_time=true)
+      def parse_file(with_z, with_m)
         data = @gpx.read
         @file_mode = data =~ /trkpt/ ? "//trkpt" : "//rtept"
         Nokogiri.HTML(data).search(@file_mode).each do |tp|
-          time = time.inner_text if parse_time && time = tp.at("time")
-          @points << Point.from_x_y_z_m(tp["lon"].to_f, tp["lat"].to_f, tp.at("ele").inner_text.to_i, time)
+          z = z.inner_text.to_i if with_z && z = tp.at("ele")
+          m = m.inner_text if with_m && m = tp.at("time")
+          @points << Point.from_coordinates([tp["lon"].to_f, tp["lat"].to_f, z, m],nil,with_z, with_m)
         end
         close
         @record_count = @points.length

data/spec/geo_ruby/gpx4r/gpx_spec.rb

@@ -15,9 +15,9 @@ describe Gpx4r do
   describe "Waypoints" do
 
     before(:all) do
-      @gpxfile = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/short.gpx')
-      @gpxfile2 = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/fells_loop')
-      @gpxfile3 = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/tracktreks.gpx')
+      @gpxfile = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/short.gpx', :with_z => true, :with_m => true)
+      @gpxfile2 = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/fells_loop', :with_z => true, :with_m => true)
+      @gpxfile3 = GpxFile.open(File.dirname(__FILE__) + '/../../data/gpx/tracktreks.gpx', :with_z => true)
     end
 
     it "should open and parse" do
@@ -59,7 +59,7 @@ describe Gpx4r do
 
     it "should read Z and M 3" do
       @gpxfile3[0].z.should eql(88)
-      @gpxfile3[0].m.should be_nil
+      @gpxfile3[0].m.should eql(0.0)
     end
 
     it "should return it as a linestring" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-georuby
 version: !ruby/object:Gem::Version 
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors: 
 - Guilhem Vellut