X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fe805836cc89efd9d053a15e2c1a78eef3f57582..625e7c3296c46141d199a8a0c69822bc1b38ae6a:/lib/gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 7c72c726f..3e1cb9afa 100644
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -4,38 +4,29 @@ 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)
+    def initialize(file, options = {})
       @file = file
+      @maximum_points = options[:maximum_points] || Float::INFINITY
     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
+            raise FileTooBigError if @possible_points > @maximum_points
           elsif reader.name == "ele" && point
             point.altitude = reader.read_string.to_f
           elsif reader.name == "time" && point
-            point.timestamp = Time.parse(reader.read_string)
+            point.timestamp = Time.parse(reader.read_string).utc
           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,19 +38,42 @@ module GPX
       end
     end
 
-    def picture(min_lat, min_lon, max_lat, max_lon, _num_points)
+    def points(&block)
+      return enum_for(:points) unless block
+
+      @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) if entry.regular?
+        end
+      rescue Archive::Error
+        io = ::File.open(@file)
+
+        case Marcel::MimeType.for(io)
+        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
 
-      ptsper = _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)
 
-      frames = Array.new(nframes,  GD2::Image::IndexedColor.new(width, height))
+      frames = []
 
-      (0..nframes - 1).each do |n|
+      (0...nframes).each do |n|
         frames[n] = GD2::Image::IndexedColor.new(width, height)
         black = frames[n].palette.allocate(GD2::Color[0, 0, 0])
         white = frames[n].palette.allocate(GD2::Color[255, 255, 255])
@@ -84,30 +98,32 @@ module GPX
             px = proj.x(p.longitude)
             py = proj.y(p.latitude)
 
-            if ((pt >= (ptsper * n)) && (pt <= (ptsper * (n+1))))
-              pen.thickness=(3)
+            if (pt >= (points_per_frame * n)) && (pt <= (points_per_frame * (n + 1)))
+              pen.thickness = 3
               pen.color = black
             else
-              pen.thickness=(1)
+              pen.thickness = 1
               pen.color = grey
             end
 
             pen.line(px, py, oldpx, oldpy) unless first
-              first = false
-              oldpy = py
-              oldpx = px
+            first = false
+            oldpy = py
+            oldpx = px
           end
         end
       end
 
-      res = GD2::AnimatedGif::gif_anim_begin(frames[0])
-      res << GD2::AnimatedGif::gif_anim_add(frames[0], nil, delay)
-      (1..nframes - 1).each do |n|
-        res << GD2::AnimatedGif::gif_anim_add(frames[n], 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
     end
 
     def icon(min_lat, min_lon, max_lat, max_lon)
@@ -147,7 +163,7 @@ module GPX
         end
       end
 
-      image.gif
+      StringIO.new(image.gif)
     end
   end
 
@@ -158,4 +174,10 @@ module GPX
         longitude >= -180 && longitude <= 180
     end
   end
+
+  class FileTooBigError < RuntimeError
+    def initialise
+      super("GPX File contains too many points")
+    end
+  end
 end