Use badges for the trace visibility labels

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 1b1c17ac7876f3bad65a40ba476daa6201ee0d55..1212db6423deadeaa62fca89cfd674b8b5a39646 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -12,17 +12,7 @@ module GPX
       @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
@@ -47,13 +37,36 @@ module GPX
       end
     end
 
+    def points(&block)
+      return enum_for(:points) unless block_given?
+
+      @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)
+        end
+      rescue Archive::Error
+        io = ::File.open(@file)
+
+        case MimeMagic.by_magic(io)&.type
+        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
       delay = 50
 
-      points_per_frame = num_points / nframes
+      points_per_frame = (num_points.to_f / nframes).ceil
 
       proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
 
@@ -101,6 +114,7 @@ module GPX
       end
 
       image = GD2::AnimatedGif.new
+      image.add(frames.first)
       frames.each do |frame|
         image.add(frame, :delay => delay)
       end