X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a6b84a0294a2929006ff056f56103be549c5b5a2..1392e63272e24a139cde80211bd0083221f3b455:/lib/gpx.rb diff --git a/lib/gpx.rb b/lib/gpx.rb index f1c82cf92..ee9d53afa 100644 --- 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? @@ -63,7 +63,7 @@ module GPX highlightgc.stroke("#000000") highlightgc.fill("#000000") - images = frames.times.collect do + images = Array(frames) do Magick::Image.new(width, height) do |image| image.background_color = "white" image.format = "GIF" @@ -81,11 +81,11 @@ module GPX if m > 0 frames.times do |n| - if n == mm - gc = highlightgc.dup - else - gc = linegc.dup - end + gc = if n == mm + highlightgc.dup + else + linegc.dup + end gc.line(px, py, oldpx, oldpy) @@ -148,13 +148,11 @@ module GPX end end - private - TrkPt = Struct.new(:segment, :latitude, :longitude, :altitude, :timestamp) do def valid? latitude && longitude && timestamp && - latitude >= -90 && latitude <= 90 && - longitude >= -180 && longitude <= 180 + latitude >= -90 && latitude <= 90 && + longitude >= -180 && longitude <= 180 end end end