X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4abd9cfcf19701bf43322374c5df6dd586449e54..e443d99edd9c9b68d6c0fa41b028bb9a5cdb07c5:/lib/gpx.rb?ds=inline

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 86cf2f49d..274ece7d9 100644
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -22,7 +22,7 @@ module GPX
           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?
@@ -50,7 +50,7 @@ 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
@@ -121,7 +121,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 +161,7 @@ module GPX
         end
       end
 
-      image.gif
+      StringIO.new(image.gif)
     end
   end