Merge remote-tracking branch 'upstream/pull/2189'

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index f1c82cf926748de5db42a890bfafac0e446fb31e..721e5608b5cd9e22d59f2b13ab0a9965b20d51d7 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -13,6 +13,8 @@ module GPX
     end
 
     def points
     end
 
     def points

+      return enum_for(:points) unless block_given?
+

       @possible_points = 0
       @actual_points = 0
       @tracksegs = 0
       @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
           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?
           end
         elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT
           if reader.name == "trkpt" && point && point.valid?


@@ -45,71 +47,47 @@ module GPX
       end
     end
 
       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)
+      # frames = 10

       width = 250
       height = 250
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
       width = 250
       height = 250
       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"
-        end
-      end
-
-      oldpx = 0.0
-      oldpy = 0.0
+      # TODO: create animated gif
+      # https://github.com/openstreetmap/openstreetmap-website/issues/281
+      image = GD2::Image::IndexedColor.new(width, height)

 
 

-      m = 0
-      mm = 0
-      points do |p|
-        px = proj.x(p.longitude)
-        py = proj.y(p.latitude)
+      black = image.palette.allocate(GD2::Color[0, 0, 0])
+      white = image.palette.allocate(GD2::Color[255, 255, 255])

 
 

-        if m > 0
-          frames.times do |n|
-            if n == mm
-              gc = highlightgc.dup
-            else
-              gc = linegc.dup
-            end
+      image.draw do |pen|
+        pen.color = white
+        pen.rectangle(0, 0, width, height, true)
+      end

 
 

-            gc.line(px, py, oldpx, oldpy)
+      image.draw do |pen|
+        pen.color = black
+        pen.anti_aliasing = true
+        pen.dont_blend = false

 
 

-            gc.draw(images[n])
-          end
-        end
+        oldpx = 0.0
+        oldpy = 0.0

 
 

-        m += 1
-        mm += 1 if m > num_points.to_f / frames.to_f * (mm + 1)
+        first = true

 
 

-        oldpy = py
-        oldpx = px
-      end
+        points do |p|
+          px = proj.x(p.longitude)
+          py = proj.y(p.latitude)

 
 

-      il = Magick::ImageList.new
+          pen.line(px, py, oldpx, oldpy) unless first

 
 

-      images.each do |f|
-        il << f
+          first = false
+          oldpy = py
+          oldpx = px
+        end

       end
 
       end
 

-      il.delay = 50
-      il.format = "GIF"
-
-      il.to_blob
+      image.gif

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


@@ -117,44 +95,47 @@ module GPX
       height = 50
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
       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)
+
+      black = image.palette.allocate(GD2::Color[0, 0, 0])
+      white = image.palette.allocate(GD2::Color[255, 255, 255])

 
 

-      image = Magick::Image.new(width, height) do |i|
-        i.background_color = "white"
-        i.format = "GIF"
+      image.draw do |pen|
+        pen.color = white
+        pen.rectangle(0, 0, width, height, true)

       end
 
       end
 

-      oldpx = 0.0
-      oldpy = 0.0
+      image.draw do |pen|
+        pen.color = black
+        pen.anti_aliasing = true
+        pen.dont_blend = false

 
 

-      first = true
+        oldpx = 0.0
+        oldpy = 0.0

 
 

-      points do |p|
-        px = proj.x(p.longitude)
-        py = proj.y(p.latitude)
+        first = true

 
 

-        gc.dup.line(px, py, oldpx, oldpy).draw(image) unless first
+        points do |p|
+          px = proj.x(p.longitude)
+          py = proj.y(p.latitude)

 
 

-        first = false
-        oldpy = py
-        oldpx = px
+          pen.line(px, py, oldpx, oldpy) unless first
+
+          first = false
+          oldpy = py
+          oldpx = px
+        end

       end
 
       end
 

-      image.to_blob
+      image.gif

     end
   end
 
     end
   end
 

-  private
-

   TrkPt = Struct.new(:segment, :latitude, :longitude, :altitude, :timestamp) do
     def valid?
       latitude && longitude && 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
     end
   end
 end