X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/baf10cd39289cd7e94a819305e46f43e85a136c6..4e64291839d45a0c660fc84f11a6c4c811cf8f21:/lib/gpx.rb?ds=inline diff --git a/lib/gpx.rb b/lib/gpx.rb index ae9af0d46..f1c82cf92 100644 --- a/lib/gpx.rb +++ b/lib/gpx.rb @@ -52,21 +52,21 @@ 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.collect do Magick::Image.new(width, height) do |image| - image.background_color = 'white' - image.format = 'GIF' + image.background_color = "white" + image.format = "GIF" end end @@ -94,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 @@ -109,7 +107,7 @@ module GPX end il.delay = 50 - il.format = 'GIF' + il.format = "GIF" il.to_blob end @@ -120,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 |i| - i.background_color = 'white' - i.format = 'GIF' + i.background_color = "white" + i.format = "GIF" end oldpx = 0.0 @@ -152,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