Localisation updates from https://translatewiki.net.

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 0a7a88c105fec08fbedf61513f873a8600dc6cee..f1c82cf926748de5db42a890bfafac0e446fb31e 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -52,33 +52,27 @@ module GPX
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
       linegc = Magick::Draw.new
-      linegc.stroke_linejoin('miter')
+      linegc.stroke_linejoin("miter")
       linegc.stroke_width(1)
-      linegc.stroke('#BBBBBB')
-      linegc.fill('#BBBBBB')
+      linegc.stroke("#BBBBBB")
+      linegc.fill("#BBBBBB")
 
       highlightgc = Magick::Draw.new
-      highlightgc.stroke_linejoin('miter')
+      highlightgc.stroke_linejoin("miter")
       highlightgc.stroke_width(3)
-      highlightgc.stroke('#000000')
-      highlightgc.fill('#000000')
+      highlightgc.stroke("#000000")
+      highlightgc.fill("#000000")
 
-      images = []
-
-      frames.times do
-        image = Magick::Image.new(width, height) do |image|
-          image.background_color = 'white'
-          image.format = 'GIF'
+      images = frames.times.collect do
+        Magick::Image.new(width, height) do |image|
+          image.background_color = "white"
+          image.format = "GIF"
         end
-
-        images << image
       end
 
       oldpx = 0.0
       oldpy = 0.0
 
-      first = true
-
       m = 0
       mm = 0
       points do |p|
@@ -100,9 +94,7 @@ module GPX
         end
 
         m += 1
-        if m > num_points.to_f / frames.to_f * (mm + 1)
-          mm += 1
-        end
+        mm += 1 if m > num_points.to_f / frames.to_f * (mm + 1)
 
         oldpy = py
         oldpx = px
@@ -115,7 +107,7 @@ module GPX
       end
 
       il.delay = 50
-      il.format = 'GIF'
+      il.format = "GIF"
 
       il.to_blob
     end
@@ -126,14 +118,14 @@ module GPX
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
       gc = Magick::Draw.new
-      gc.stroke_linejoin('miter')
+      gc.stroke_linejoin("miter")
       gc.stroke_width(1)
-      gc.stroke('#000000')
-      gc.fill('#000000')
+      gc.stroke("#000000")
+      gc.fill("#000000")
 
-      image = Magick::Image.new(width, height) do |image|
-        image.background_color = 'white'
-        image.format = 'GIF'
+      image = Magick::Image.new(width, height) do |i|
+        i.background_color = "white"
+        i.format = "GIF"
       end
 
       oldpx = 0.0
@@ -158,11 +150,11 @@ module GPX
 
   private
 
-  class TrkPt < Struct.new(:segment, :latitude, :longitude, :altitude, :timestamp)
+  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