Merge remote-tracking branch 'upstream/pull/2204'
authorTom Hughes <tom@compton.nu>
Mon, 10 Jun 2019 20:29:38 +0000 (21:29 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 10 Jun 2019 20:29:38 +0000 (21:29 +0100)
Gemfile
Gemfile.lock
lib/gpx.rb

diff --git a/Gemfile b/Gemfile
index f0e3885033c0f4ac4bd22a136064b403639c2ce1..dc1615ffc47508cecd75556cd260902d0a366b46 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,7 @@ gem "canonical-rails"
 gem "logstasher"
 
 # Used to generate images for traces
-gem "gd2-ffij"
+gem "gd2-ffij", ">= 0.4.0"
 
 # Used for browser detection
 gem "browser"
index de5157c0489f70b845895d3663b1eb1f0bd8d306..4798189389fd0e70d89c2011ad14788e2c14c9df 100644 (file)
@@ -178,7 +178,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     fspath (3.1.1)
-    gd2-ffij (0.3.0)
+    gd2-ffij (0.4.0)
       ffi (>= 1.0.0)
     geoip (1.6.4)
     globalid (0.4.2)
@@ -471,7 +471,7 @@ DEPENDENCIES
   factory_bot_rails
   fakefs
   faraday
-  gd2-ffij
+  gd2-ffij (>= 0.4.0)
   geoip
   htmlentities
   http_accept_language (~> 2.0.0)
index 721e5608b5cd9e22d59f2b13ab0a9965b20d51d7..1b1c17ac7876f3bad65a40ba476daa6201ee0d55 100644 (file)
@@ -47,47 +47,68 @@ 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
+
+      points_per_frame = num_points / nframes
+
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
-      # TODO: create animated gif
-      # https://github.com/openstreetmap/openstreetmap-website/issues/281
-      image = GD2::Image::IndexedColor.new(width, height)
+      frames = []
 
-      black = image.palette.allocate(GD2::Color[0, 0, 0])
-      white = image.palette.allocate(GD2::Color[255, 255, 255])
+      (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])
 
-      image.draw do |pen|
-        pen.color = white
-        pen.rectangle(0, 0, width, height, true)
-      end
+        frames[n].draw do |pen|
+          pen.color = white
+          pen.rectangle(0, 0, width, height, true)
+        end
 
-      image.draw do |pen|
-        pen.color = black
-        pen.anti_aliasing = true
-        pen.dont_blend = false
+        frames[n].draw do |pen|
+          pen.color = black
+          pen.anti_aliasing = true
+          pen.dont_blend = false
 
-        oldpx = 0.0
-        oldpy = 0.0
+          oldpx = 0.0
+          oldpy = 0.0
 
-        first = true
+          first = true
 
-        points do |p|
-          px = proj.x(p.longitude)
-          py = proj.y(p.latitude)
+          points.each_with_index do |p, pt|
+            px = proj.x(p.longitude)
+            py = proj.y(p.latitude)
 
-          pen.line(px, py, oldpx, oldpy) unless first
+            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
 
-          first = false
-          oldpy = py
-          oldpx = px
+            pen.line(px, py, oldpx, oldpy) unless first
+            first = false
+            oldpy = py
+            oldpx = px
+          end
         end
       end
 
-      image.gif
+      image = GD2::AnimatedGif.new
+      frames.each do |frame|
+        image.add(frame, :delay => delay)
+      end
+      image.end
+
+      output = StringIO.new
+      image.export(output)
+      output.read
     end
 
     def icon(min_lat, min_lon, max_lat, max_lon)