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

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 0aa23ae0b026eddc1af146780a56ff982ce14364..3e1cb9afa6d9cf6da4ca51d80255576c3f25f309 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -4,28 +4,29 @@ 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)
+    def initialize(file, options = {})

       @file = file
       @file = file

+      @maximum_points = options[:maximum_points] || Float::INFINITY

     end
 
     def parse_file(reader)
       point = nil
 
       while reader.read
     end
 
     def parse_file(reader)
       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
           if reader.name == "trkpt"
             point = TrkPt.new(@tracksegs, reader["lat"].to_f, reader["lon"].to_f)
             @possible_points += 1

+            raise FileTooBigError if @possible_points > @maximum_points

           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 = 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


@@ -38,20 +39,20 @@ module GPX
     end
 
     def points(&block)
     end
 
     def points(&block)

-      return enum_for(:points) unless block_given?
+      return enum_for(:points) unless block

 
       @possible_points = 0
       @actual_points = 0
       @tracksegs = 0
 
       begin
 
       @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)
+        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)
 
         end
       rescue Archive::Error
         io = ::File.open(@file)
 

-        case MimeMagic.by_magic(io).type
+        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
         when "application/gzip" then io = Zlib::GzipReader.open(@file)
         when "application/x-bzip" then io = Bzip2::FFI::Reader.open(@file)
         end


@@ -122,7 +123,7 @@ module GPX
 
       output = StringIO.new
       image.export(output)
 
       output = StringIO.new
       image.export(output)

-      output.read
+      output

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


@@ -162,7 +163,7 @@ module GPX
         end
       end
 
         end
       end
 

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

     end
   end
 
     end
   end
 


@@ -173,4 +174,10 @@ module GPX
         longitude >= -180 && longitude <= 180
     end
   end
         longitude >= -180 && longitude <= 180
     end
   end

+
+  class FileTooBigError < RuntimeError
+    def initialise
+      super("GPX File contains too many points")
+    end
+  end

 end
 end