X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/de29e9b3f59d7a06fbe2e32096328bd8a6ed2b3a..e6d7da3a629c952a5d27f4d356dd4d5c4293848a:/lib/gpx.rb?ds=sidebyside

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 8510df916..1a1d0b996 100644
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -4,27 +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
-      @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
@@ -33,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
@@ -45,71 +36,92 @@ 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)
-      frames = 10
+      nframes = 10
       width = 250
       height = 250
+      delay = 50
+
+      points_per_frame = (num_points.to_f / nframes).ceil
+
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
-      linegc = Magick::Draw.new
-      linegc.stroke_linejoin("miter")
-      linegc.stroke_width(1)
-      linegc.stroke("#BBBBBB")
-      linegc.fill("#BBBBBB")
-
-      highlightgc = Magick::Draw.new
-      highlightgc.stroke_linejoin("miter")
-      highlightgc.stroke_width(3)
-      highlightgc.stroke("#000000")
-      highlightgc.fill("#000000")
-
-      images = Array(frames) do
-        Magick::Image.new(width, height) do |image|
-          image.background_color = "white"
-          image.format = "GIF"
+      frames = []
+
+      (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])
+        grey = frames[n].palette.allocate(GD2::Color[187, 187, 187])
+
+        frames[n].draw do |pen|
+          pen.color = white
+          pen.rectangle(0, 0, width, height, true)
         end
-      end
 
-      oldpx = 0.0
-      oldpy = 0.0
+        frames[n].draw do |pen|
+          pen.color = black
+          pen.anti_aliasing = true
+          pen.dont_blend = false
+
+          oldpx = 0.0
+          oldpy = 0.0
 
-      m = 0
-      mm = 0
-      points do |p|
-        px = proj.x(p.longitude)
-        py = proj.y(p.latitude)
+          first = true
 
-        if m.positive?
-          frames.times do |n|
-            gc = if n == mm
-                   highlightgc.dup
-                 else
-                   linegc.dup
-                 end
+          points.each_with_index do |p, pt|
+            px = proj.x(p.longitude)
+            py = proj.y(p.latitude)
 
-            gc.line(px, py, oldpx, oldpy)
+            if (pt >= (points_per_frame * n)) && (pt <= (points_per_frame * (n + 1)))
+              pen.thickness = 3
+              pen.color = black
+            else
+              pen.thickness = 1
+              pen.color = grey
+            end
 
-            gc.draw(images[n])
+            pen.line(px, py, oldpx, oldpy) unless first
+            first = false
+            oldpy = py
+            oldpx = px
           end
         end
-
-        m += 1
-        mm += 1 if m > num_points.to_f / frames.to_f * (mm + 1)
-
-        oldpy = py
-        oldpx = px
       end
 
-      il = Magick::ImageList.new
-
-      images.each do |f|
-        il << f
+      image = GD2::AnimatedGif.new
+      image.add(frames.first)
+      frames.each do |frame|
+        image.add(frame, :delay => delay)
       end
+      image.end
 
-      il.delay = 50
-      il.format = "GIF"
-
-      il.to_blob
+      output = StringIO.new
+      image.export(output)
+      output.read
     end
 
     def icon(min_lat, min_lon, max_lat, max_lon)
@@ -117,34 +129,39 @@ module GPX
       height = 50
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
-      gc = Magick::Draw.new
-      gc.stroke_linejoin("miter")
-      gc.stroke_width(1)
-      gc.stroke("#000000")
-      gc.fill("#000000")
+      image = GD2::Image::IndexedColor.new(width, height)
 
-      image = Magick::Image.new(width, height) do |i|
-        i.background_color = "white"
-        i.format = "GIF"
+      black = image.palette.allocate(GD2::Color[0, 0, 0])
+      white = image.palette.allocate(GD2::Color[255, 255, 255])
+
+      image.draw do |pen|
+        pen.color = white
+        pen.rectangle(0, 0, width, height, true)
       end
 
-      oldpx = 0.0
-      oldpy = 0.0
+      image.draw do |pen|
+        pen.color = black
+        pen.anti_aliasing = true
+        pen.dont_blend = false
+
+        oldpx = 0.0
+        oldpy = 0.0
 
-      first = true
+        first = true
 
-      points do |p|
-        px = proj.x(p.longitude)
-        py = proj.y(p.latitude)
+        points do |p|
+          px = proj.x(p.longitude)
+          py = proj.y(p.latitude)
 
-        gc.dup.line(px, py, oldpx, oldpy).draw(image) unless first
+          pen.line(px, py, oldpx, oldpy) unless first
 
-        first = false
-        oldpy = py
-        oldpx = px
+          first = false
+          oldpy = py
+          oldpx = px
+        end
       end
 
-      image.to_blob
+      image.gif
     end
   end