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

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 3dc448e4632cd85c9221d701f1c8386eca2b8151..3e1cb9afa6d9cf6da4ca51d80255576c3f25f309 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -6,8 +6,9 @@ module GPX
 
     attr_reader :possible_points, :actual_points, :tracksegs
 
-    def initialize(file)
+    def initialize(file, options = {})
       @file = file
+      @maximum_points = options[:maximum_points] || Float::INFINITY
     end
 
     def parse_file(reader)
@@ -19,10 +20,11 @@ module GPX
           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
-            point.timestamp = Time.parse(reader.read_string)
+            point.timestamp = Time.parse(reader.read_string).utc
           end
         when XML::Reader::TYPE_END_ELEMENT
           if reader.name == "trkpt" && point && point.valid?
@@ -172,4 +174,10 @@ module GPX
         longitude >= -180 && longitude <= 180
     end
   end
+
+  class FileTooBigError < RuntimeError
+    def initialise
+      super("GPX File contains too many points")
+    end
+  end
 end