end
def points
+ return enum_for(:points) unless block_given?
+
@possible_points = 0
@actual_points = 0
@tracksegs = 0
point = nil
- while reader.read > 0
+ while reader.read
if reader.node_type == XML::Reader::TYPE_ELEMENT
if reader.name == "trkpt"
point = TrkPt.new(@tracksegs, reader["lat"].to_f, reader["lon"].to_f)
@possible_points += 1
- elsif reader.name == "ele" and point
+ elsif reader.name == "ele" && point
point.altitude = reader.read_string.to_f
- elsif reader.name == "time" and point
- point.timestamp = DateTime.parse(reader.read_string)
+ elsif reader.name == "time" && point
+ point.timestamp = Time.parse(reader.read_string)
end
elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT
- if reader.name == "trkpt" and point and point.valid?
+ if reader.name == "trkpt" && point && point.valid?
point.altitude ||= 0
yield point
@actual_points += 1
end
end
- def picture(min_lat, min_lon, max_lat, max_lon, num_points)
- frames = 10
+ def picture(min_lat, min_lon, max_lat, max_lon, _num_points)
+ nframes = 10
width = 250
height = 250
- proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
+ delay = 50
- linegc = Magick::Draw.new
- linegc.stroke_linejoin('miter')
- linegc.stroke_width(1)
- linegc.stroke('#BBBBBB')
- linegc.fill('#BBBBBB')
+ ptsper = _num_points / nframes;
+
+ proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
- highlightgc = Magick::Draw.new
- highlightgc.stroke_linejoin('miter')
- highlightgc.stroke_width(3)
- highlightgc.stroke('#000000')
- highlightgc.fill('#000000')
+ frames = Array.new(nframes, GD2::Image::IndexedColor.new(width, height))
- images = []
+ (0..nframes - 1).each do |n|
+ frames[n] = GD2::Image::IndexedColor.new(width, height)
+ black = frames[n].palette.allocate(GD2::Color[0, 0, 0])
+ white = frames[n].palette.allocate(GD2::Color[255, 255, 255])
+ grey = frames[n].palette.allocate(GD2::Color[187, 187, 187])
- frames.times do
- image = Magick::Image.new(width, height) do |image|
- image.background_color = 'white'
- image.format = 'GIF'
+ frames[n].draw do |pen|
+ pen.color = white
+ pen.rectangle(0, 0, width, height, true)
end
- images << image
- end
+ frames[n].draw do |pen|
+ pen.color = black
+ pen.anti_aliasing = true
+ pen.dont_blend = false
- oldpx = 0.0
- oldpy = 0.0
+ oldpx = 0.0
+ oldpy = 0.0
- first = true
+ first = true
- m = 0
- mm = 0
- points do |p|
- px = proj.x(p.longitude)
- py = proj.y(p.latitude)
+ points.each_with_index do |p, pt|
+ px = proj.x(p.longitude)
+ py = proj.y(p.latitude)
- if m > 0
- frames.times do |n|
- if n == mm
- gc = highlightgc.dup
+ if ((pt >= (ptsper * n)) && (pt <= (ptsper * (n+1))))
+ pen.thickness=(3)
+ pen.color = black
else
- gc = linegc.dup
+ pen.thickness=(1)
+ pen.color = grey
end
- gc.line(px, py, oldpx, oldpy)
-
- gc.draw(images[n])
+ pen.line(px, py, oldpx, oldpy) unless first
+ first = false
+ oldpy = py
+ oldpx = px
end
end
-
- m += 1
- if m > num_points.to_f / frames.to_f * (mm+1)
- mm += 1
- end
-
- oldpy = py
- oldpx = px
end
- il = Magick::ImageList.new
-
- images.each do |f|
- il << f
+ res = GD2::AnimatedGif::gif_anim_begin(frames[0])
+ res << GD2::AnimatedGif::gif_anim_add(frames[0], nil, delay)
+ (0..nframes - 1).each do |n|
+ res << GD2::AnimatedGif::gif_anim_add(frames[n], frames[n-1], delay)
end
+ res << GD2::AnimatedGif::gif_anim_end()
- il.delay = 50
- il.format = 'GIF'
-
- return il.to_blob
+ res
end
def icon(min_lat, min_lon, max_lat, max_lon)
height = 50
proj = OSM::Mercator.new(min_lat, min_lon, max_lat, max_lon, width, height)
- gc = Magick::Draw.new
- gc.stroke_linejoin('miter')
- gc.stroke_width(1)
- gc.stroke('#000000')
- gc.fill('#000000')
+ image = GD2::Image::IndexedColor.new(width, height)
+
+ black = image.palette.allocate(GD2::Color[0, 0, 0])
+ white = image.palette.allocate(GD2::Color[255, 255, 255])
- image = Magick::Image.new(width, height) do |image|
- image.background_color = 'white'
- image.format = 'GIF'
+ image.draw do |pen|
+ pen.color = white
+ pen.rectangle(0, 0, width, height, true)
end
- oldpx = 0.0
- oldpy = 0.0
+ image.draw do |pen|
+ pen.color = black
+ pen.anti_aliasing = true
+ pen.dont_blend = false
- first = true
+ oldpx = 0.0
+ oldpy = 0.0
- points do |p|
- px = proj.x(p.longitude)
- py = proj.y(p.latitude)
+ first = true
- gc.dup.line(px, py, oldpx, oldpy).draw(image) unless first
+ points do |p|
+ px = proj.x(p.longitude)
+ py = proj.y(p.latitude)
- first = false
- oldpy = py
- oldpx = px
+ pen.line(px, py, oldpx, oldpy) unless first
+
+ first = false
+ oldpy = py
+ oldpx = px
+ end
end
- return image.to_blob
+ image.gif
end
end
-private
-
- class TrkPt < Struct.new(:segment, :latitude, :longitude, :altitude, :timestamp)
+ TrkPt = Struct.new(:segment, :latitude, :longitude, :altitude, :timestamp) do
def valid?
- self.latitude and self.longitude and self.timestamp and
- self.latitude >= -90 and self.latitude <= 90 and
- self.longitude >= -180 and self.longitude <= 180
+ latitude && longitude && timestamp &&
+ latitude >= -90 && latitude <= 90 &&
+ longitude >= -180 && longitude <= 180
end
end
end
projects / rails.git / blobdiff