X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2490fdc4961c2b78c8dd57db4ee29431dedde2ef..1c3e4746b0c901c19722ee6443266de325cca668:/lib/gpx.rb?ds=sidebyside diff --git a/lib/gpx.rb b/lib/gpx.rb index 86cf2f49d..45a4dcf5f 100644 --- 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,13 +20,14 @@ 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? + if reader.name == "trkpt" && point&.valid? point.altitude ||= 0 yield point @actual_points += 1 @@ -50,12 +52,12 @@ module GPX 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 - parse_file(XML::Reader.io(io), &block) + parse_file(XML::Reader.io(io, :options => XML::Parser::Options::NOERROR), &block) end end @@ -121,7 +123,7 @@ module GPX output = StringIO.new image.export(output) - output.read + output end def icon(min_lat, min_lon, max_lat, max_lon) @@ -161,7 +163,7 @@ module GPX end end - image.gif + StringIO.new(image.gif) end end @@ -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