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

[rails.git] / lib / gpx.rb

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 3ec11c5c475a7b866a666b68a5552994f0ecb73c..8510df916821b7fc3aa615f54a880e81bd6bce3d 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -31,7 +31,7 @@ module GPX
           elsif reader.name == "ele" && point
             point.altitude = reader.read_string.to_f
           elsif reader.name == "time" && point
-            point.timestamp = DateTime.parse(reader.read_string)
+            point.timestamp = Time.parse(reader.read_string)
           end
         elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT
           if reader.name == "trkpt" && point && point.valid?
@@ -79,7 +79,7 @@ module GPX
         px = proj.x(p.longitude)
         py = proj.y(p.latitude)
 
-        if m > 0
+        if m.positive?
           frames.times do |n|
             gc = if n == mm
                    highlightgc.dup