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

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 71b2823b85c16a38689987de8fd01a2c97533b1f..274ece7d9a3160e6eba8f194fcbe6eb7956bffbc 100644 (file)
--- 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
           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?
           end
         when XML::Reader::TYPE_END_ELEMENT
           if reader.name == "trkpt" && point && point.valid?


@@ -121,7 +121,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)


@@ -161,7 +161,7 @@ module GPX
         end
       end
 
         end
       end
 

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

     end
   end
 
     end
   end