X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..1316ed8c1110ff25f9e09c57dd6a85dc4b97fb65:/lib/gpx.rb?ds=sidebyside

diff --git a/lib/gpx.rb b/lib/gpx.rb
index f1c82cf92..0299f63b5 100644
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -13,6 +13,8 @@ module GPX
     end
 
     def points
+      return enum_for(:points) unless block_given?
+
       @possible_points = 0
       @actual_points = 0
       @tracksegs = 0
@@ -31,7 +33,7 @@ module GPX
           elsif reader.name == "ele" && point
             point.altitude = reader.read_string.to_f
           elsif reader.name == "time" && point
-            point.timestamp = DateTime.parse(reader.read_string)
+            point.timestamp = Time.parse(reader.read_string)
           end
         elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT
           if reader.name == "trkpt" && point && point.valid?
@@ -45,71 +47,67 @@ module GPX
       end
     end
 
-    def picture(min_lat, min_lon, max_lat, max_lon, num_points)
-      frames = 10
+    def picture(min_lat, min_lon, max_lat, max_lon, _num_points)
+      nframes = 10
       width = 250
       height = 250
+      delay = 50
+
+      ptsper = _num_points / nframes;
+
       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 = frames.times.collect do
-        Magick::Image.new(width, height) do |image|
-          image.background_color = "white"
-          image.format = "GIF"
+      frames = []
+
+      (0..nframes - 1).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 > 0
-          frames.times do |n|
-            if n == mm
-              gc = highlightgc.dup
+          points.each_with_index do |p, pt|
+            px = proj.x(p.longitude)
+            py = proj.y(p.latitude)
+
+            if ((pt >= (ptsper * n)) && (pt <= (ptsper * (n+1))))
+              pen.thickness=(3)
+              pen.color = black
             else
-              gc = linegc.dup
+              pen.thickness=(1)
+              pen.color = grey
             end
 
-            gc.line(px, py, oldpx, oldpy)
-
-            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
+      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)
       end
+      res << GD2::AnimatedGif::gif_anim_end()
 
-      il.delay = 50
-      il.format = "GIF"
-
-      il.to_blob
+      res
     end
 
     def icon(min_lat, min_lon, max_lat, max_lon)
@@ -117,44 +115,47 @@ 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
 
-  private
-
   TrkPt = Struct.new(:segment, :latitude, :longitude, :altitude, :timestamp) do
     def valid?
       latitude && longitude && timestamp &&
-      latitude >= -90 && latitude <= 90 &&
-      longitude >= -180 && longitude <= 180
+        latitude >= -90 && latitude <= 90 &&
+        longitude >= -180 && longitude <= 180
     end
   end
 end