X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2ecfd61ee9e7f1905638474b98b14b5597409fe6..95e1aff23493b3725d5259bcca7bcc79d7d3bc26:/lib/gpx.rb?ds=inline diff --git a/lib/gpx.rb b/lib/gpx.rb index d0607233a..3e1cb9afa 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,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? @@ -44,13 +46,13 @@ module GPX @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) - 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 @@ -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