Drop monkey patches that are no longer required

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 2041ce7c010068a07dec5ec0d03fbf0b9077ceff..3ec11c5c475a7b866a666b68a5552994f0ecb73c 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -28,13 +28,13 @@ module GPX
           if reader.name == "trkpt"
             point = TrkPt.new(@tracksegs, reader["lat"].to_f, reader["lon"].to_f)
             @possible_points += 1
           if reader.name == "trkpt"
             point = TrkPt.new(@tracksegs, reader["lat"].to_f, reader["lon"].to_f)
             @possible_points += 1

-          elsif reader.name == "ele" and point
+          elsif reader.name == "ele" && point

             point.altitude = reader.read_string.to_f
             point.altitude = reader.read_string.to_f

-          elsif reader.name == "time" and point
+          elsif reader.name == "time" && point

             point.timestamp = DateTime.parse(reader.read_string)
           end
         elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT
             point.timestamp = DateTime.parse(reader.read_string)
           end
         elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT

-          if reader.name == "trkpt" and point and point.valid?
+          if reader.name == "trkpt" && point && point.valid?

             point.altitude ||= 0
             yield point
             @actual_points += 1
             point.altitude ||= 0
             yield point
             @actual_points += 1


@@ -52,33 +52,27 @@ module GPX
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
       linegc = Magick::Draw.new
       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_width(1)

-      linegc.stroke('#BBBBBB')
-      linegc.fill('#BBBBBB')
+      linegc.stroke("#BBBBBB")
+      linegc.fill("#BBBBBB")

 
       highlightgc = Magick::Draw.new
 
       highlightgc = Magick::Draw.new

-      highlightgc.stroke_linejoin('miter')
+      highlightgc.stroke_linejoin("miter")

       highlightgc.stroke_width(3)
       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 = Array(frames) do
+        Magick::Image.new(width, height) do |image|
+          image.background_color = "white"
+          image.format = "GIF"

         end
         end

-
-        images << image

       end
 
       oldpx = 0.0
       oldpy = 0.0
 
       end
 
       oldpx = 0.0
       oldpy = 0.0
 

-      first = true
-

       m = 0
       mm = 0
       points do |p|
       m = 0
       mm = 0
       points do |p|


@@ -87,11 +81,11 @@ module GPX
 
         if m > 0
           frames.times do |n|
 
         if m > 0
           frames.times do |n|

-            if n == mm
-              gc = highlightgc.dup
-            else
-              gc = linegc.dup
-            end
+            gc = if n == mm
+                   highlightgc.dup
+                 else
+                   linegc.dup
+                 end

 
             gc.line(px, py, oldpx, oldpy)
 
 
             gc.line(px, py, oldpx, oldpy)
 


@@ -100,9 +94,7 @@ module GPX
         end
 
         m += 1
         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
 
         oldpy = py
         oldpx = px


@@ -115,9 +107,9 @@ module GPX
       end
 
       il.delay = 50
       end
 
       il.delay = 50

-      il.format = 'GIF'
+      il.format = "GIF"

 
 

-      return il.to_blob
+      il.to_blob

     end
 
     def icon(min_lat, min_lon, max_lat, max_lon)
     end
 
     def icon(min_lat, min_lon, max_lat, max_lon)


@@ -126,14 +118,14 @@ module GPX
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
       gc = Magick::Draw.new
       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_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
       end
 
       oldpx = 0.0


@@ -152,17 +144,15 @@ module GPX
         oldpx = px
       end
 
         oldpx = px
       end
 

-      return image.to_blob
+      image.to_blob

     end
   end
 
     end
   end
 

-private
-
-  class TrkPt < Struct.new(:segment, :latitude, :longitude, :altitude, :timestamp)
+  TrkPt = Struct.new(:segment, :latitude, :longitude, :altitude, :timestamp) do

     def valid?
     def valid?

-      self.latitude and self.longitude and self.timestamp and
-      self.latitude >= -90 and self.latitude <= 90 and
-      self.longitude >= -180 and self.longitude <= 180
+      latitude && longitude && timestamp &&
+        latitude >= -90 && latitude <= 90 &&
+        longitude >= -180 && longitude <= 180

     end
   end
 end
     end
   end
 end