X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7f138fb014e201e9e6b63ababf57d0f7c53bd86c..0e2a66e8de55b3719bd307261058b7f898598994:/lib/gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index f3e0c0e26..1a1d0b996 100644
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -4,29 +4,18 @@ module GPX
 
     include LibXML
 
-    attr_reader :possible_points
-    attr_reader :actual_points
-    attr_reader :tracksegs
+    attr_reader :possible_points, :actual_points, :tracksegs
 
     def initialize(file)
       @file = file
     end
 
-    def points
-      return enum_for(:points) unless block_given?
-
-      @possible_points = 0
-      @actual_points = 0
-      @tracksegs = 0
-
-      @file.rewind
-
-      reader = XML::Reader.io(@file)
-
+    def parse_file(reader)
       point = nil
 
       while reader.read
-        if reader.node_type == XML::Reader::TYPE_ELEMENT
+        case reader.node_type
+        when XML::Reader::TYPE_ELEMENT
           if reader.name == "trkpt"
             point = TrkPt.new(@tracksegs, reader["lat"].to_f, reader["lon"].to_f)
             @possible_points += 1
@@ -35,7 +24,7 @@ module GPX
           elsif reader.name == "time" && point
             point.timestamp = Time.parse(reader.read_string)
           end
-        elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT
+        when XML::Reader::TYPE_END_ELEMENT
           if reader.name == "trkpt" && point && point.valid?
             point.altitude ||= 0
             yield point
@@ -47,13 +36,36 @@ module GPX
       end
     end
 
+    def points(&block)
+      return enum_for(:points) unless block_given?
+
+      @possible_points = 0
+      @actual_points = 0
+      @tracksegs = 0
+
+      begin
+        Archive::Reader.open_filename(@file).each_entry_with_data do |_entry, data|
+          parse_file(XML::Reader.string(data), &block)
+        end
+      rescue Archive::Error
+        io = ::File.open(@file)
+
+        case MimeMagic.by_magic(io)&.type
+        when "application/gzip" then io = Zlib::GzipReader.open(@file)
+        when "application/x-bzip" then io = Bzip2::FFI::Reader.open(@file)
+        end
+
+        parse_file(XML::Reader.io(io), &block)
+      end
+    end
+
     def picture(min_lat, min_lon, max_lat, max_lon, num_points)
       nframes = 10
       width = 250
       height = 250
       delay = 50
 
-      points_per_frame = num_points / nframes
+      points_per_frame = (num_points.to_f / nframes).ceil
 
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
@@ -100,16 +112,16 @@ module GPX
         end
       end
 
-      res = GD2::AnimatedGif.gif_anim_begin(frames[0])
-      res << GD2::AnimatedGif.gif_anim_add(frames[0], nil, delay)
-      (1...nframes).each do |n|
-        res << GD2::AnimatedGif.gif_anim_add(frames[n],
-                                             (frames[n] == frames[n - 1] ? nil : frames[n - 1]),
-                                             delay)
+      image = GD2::AnimatedGif.new
+      image.add(frames.first)
+      frames.each do |frame|
+        image.add(frame, :delay => delay)
       end
-      res << GD2::AnimatedGif.gif_anim_end
+      image.end
 
-      res
+      output = StringIO.new
+      image.export(output)
+      output.read
     end
 
     def icon(min_lat, min_lon, max_lat, max_lon)