Merge branch 'master' into feature/add-communities-page

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 721e5608b5cd9e22d59f2b13ab0a9965b20d51d7..274ece7d9a3160e6eba8f194fcbe6eb7956bffbc 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -4,38 +4,27 @@ module GPX
 
     include LibXML
 
 
     include LibXML
 

-    attr_reader :possible_points
-    attr_reader :actual_points
-    attr_reader :tracksegs
+    attr_reader :possible_points, :actual_points, :tracksegs

 
     def initialize(file)
       @file = file
     end
 
 
     def initialize(file)
       @file = file
     end
 

-    def points
-      return enum_for(:points) unless block_given?
-
-      @possible_points = 0
-      @actual_points = 0
-      @tracksegs = 0
-
-      @file.rewind
-
-      reader = XML::Reader.io(@file)
-
+    def parse_file(reader)

       point = nil
 
       while reader.read
       point = nil
 
       while reader.read

-        if reader.node_type == XML::Reader::TYPE_ELEMENT
+        case reader.node_type
+        when XML::Reader::TYPE_ELEMENT

           if reader.name == "trkpt"
             point = TrkPt.new(@tracksegs, reader["lat"].to_f, reader["lon"].to_f)
             @possible_points += 1
           elsif reader.name == "ele" && point
             point.altitude = reader.read_string.to_f
           elsif reader.name == "time" && point
           if reader.name == "trkpt"
             point = TrkPt.new(@tracksegs, reader["lat"].to_f, reader["lon"].to_f)
             @possible_points += 1
           elsif reader.name == "ele" && point
             point.altitude = reader.read_string.to_f
           elsif reader.name == "time" && point

-            point.timestamp = Time.parse(reader.read_string)
+            point.timestamp = Time.parse(reader.read_string).utc

           end
           end

-        elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT
+        when XML::Reader::TYPE_END_ELEMENT

           if reader.name == "trkpt" && point && point.valid?
             point.altitude ||= 0
             yield point
           if reader.name == "trkpt" && point && point.valid?
             point.altitude ||= 0
             yield point


@@ -47,47 +36,92 @@ module GPX
       end
     end
 
       end
     end
 

-    def picture(min_lat, min_lon, max_lat, max_lon, _num_points)
-      # frames = 10
+    def points(&block)
+      return enum_for(:points) unless block
+
+      @possible_points = 0
+      @actual_points = 0
+      @tracksegs = 0
+
+      begin
+        Archive::Reader.open_filename(@file).each_entry_with_data do |entry, data|
+          parse_file(XML::Reader.string(data), &block) if entry.regular?
+        end
+      rescue Archive::Error
+        io = ::File.open(@file)
+
+        case Marcel::MimeType.for(io)
+        when "application/gzip" then io = Zlib::GzipReader.open(@file)
+        when "application/x-bzip" then io = Bzip2::FFI::Reader.open(@file)
+        end
+
+        parse_file(XML::Reader.io(io), &block)
+      end
+    end
+
+    def picture(min_lat, min_lon, max_lat, max_lon, num_points)
+      nframes = 10

       width = 250
       height = 250
       width = 250
       height = 250

+      delay = 50
+
+      points_per_frame = (num_points.to_f / nframes).ceil
+

       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
       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
 
         end
       end
 

-      image.gif
+      image = GD2::AnimatedGif.new
+      image.add(frames.first)
+      frames.each do |frame|
+        image.add(frame, :delay => delay)
+      end
+      image.end
+
+      output = StringIO.new
+      image.export(output)
+      output

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


@@ -127,7 +161,7 @@ module GPX
         end
       end
 
         end
       end
 

-      image.gif
+      StringIO.new(image.gif)

     end
   end
 
     end
   end