X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b3d6d4291e19e1368b48d13cf67880f7c59b5d24..cb7436602d0b3910dbf49fcfaf2bcbe333fbe76b:/lib/osm.rb diff --git a/lib/osm.rb b/lib/osm.rb index dea48cc71..b14a7f3e8 100644 --- a/lib/osm.rb +++ b/lib/osm.rb @@ -5,13 +5,14 @@ module OSM # # This would print every latitude value: # - # gpx = OSM:GPXImporter.new('somefile.gpx') + # gpx = OSM::GPXImporter.new('somefile.gpx') # gpx.points {|p| puts p['latitude']} require 'time' require 'rexml/parsers/sax2parser' require 'rexml/text' require 'xml/libxml' + require 'digest/md5' require 'RMagick' class Mercator @@ -91,6 +92,8 @@ module OSM lat = attributes['lat'].to_f lon = attributes['lon'].to_f gotlatlon = true + gotele = false + gotdate = false @possible_points += 1 end @@ -101,8 +104,11 @@ module OSM parser.listen( :characters, %w{ time } ) do |text| if text && text != '' - date = DateTime.parse(text) - gotdate = true + begin + date = DateTime.parse(text) + gotdate = true + rescue + end end end @@ -134,16 +140,27 @@ module OSM rat= Math.cos( ((max_lat + min_lat)/2.0) / 180.0 * 3.141592) proj = OSM::Mercator.new((min_lat + max_lat) / 2, (max_lon + min_lon) / 2, (max_lat - min_lat) / width / rat, width, height) + linegc = Magick::Draw.new + linegc.stroke_linejoin('miter') + linegc.stroke_width(1) + linegc.stroke('#BBBBBB') + linegc.fill('#BBBBBB') + + highlightgc = Magick::Draw.new + highlightgc.stroke_linejoin('miter') + highlightgc.stroke_width(3) + highlightgc.stroke('#000000') + highlightgc.fill('#000000') + images = [] frames.times do - gc = Magick::Draw.new - gc.stroke_linejoin('miter') - gc.stroke('#FFFFFF') - gc.fill('#FFFFFF') - gc.rectangle(0,0,width,height) - gc.stroke_width(1) - images << gc + image = Magick::Image.new(width, height) do |image| + image.background_color = 'white' + image.format = 'GIF' + end + + images << image end oldpx = 0.0 @@ -156,43 +173,39 @@ module OSM points do |p| px = proj.x(p['longitude']) py = proj.y(p['latitude']) - frames.times do |n| - images[n].stroke_width(1) - images[n].stroke('#BBBBBB') - images[n].fill('#BBBBBB') - # puts "A #{px},#{py} - #{oldpx},#{oldpy}" - images[n].line(px, py, oldpx, oldpy ) unless first + + if m > 0 + frames.times do |n| + if n == mm + gc = highlightgc.dup + else + gc = linegc.dup + end + + gc.line(px, py, oldpx, oldpy) + + gc.draw(images[n]) + end end - images[mm].stroke_width(3) - images[mm].stroke('#000000') - images[mm].fill('#000000') - images[mm].line(px, py, oldpx, oldpy ) unless first - # puts "B #{px},#{py} - #{oldpx},#{oldpy}" - m +=1 + + m += 1 if m > num_points.to_f / frames.to_f * (mm+1) mm += 1 end - first = false + oldpy = py oldpx = px end il = Magick::ImageList.new - frames.times do |n| - canvas = Magick::Image.new(width, height) { - self.background_color = 'white' - } - begin - images[n].draw(canvas) - rescue ArgumentError - end - canvas.format = 'GIF' - il << canvas + images.each do |f| + il << f end il.delay = 50 il.format = 'GIF' + return il.to_blob end @@ -203,39 +216,34 @@ module OSM rat= Math.cos( ((max_lat + min_lat)/2.0) / 180.0 * 3.141592) proj = OSM::Mercator.new((min_lat + max_lat) / 2, (max_lon + min_lon) / 2, (max_lat - min_lat) / width / rat, width, height) - images = [] - - gc = Magick::Draw.new + gc = Magick::Draw.new gc.stroke_linejoin('miter') + gc.stroke_width(1) + gc.stroke('#000000') + gc.fill('#000000') + + image = Magick::Image.new(width, height) do |image| + image.background_color = 'white' + image.format = 'GIF' + end oldpx = 0.0 oldpy = 0.0 first = true - gc.stroke_width(1) - gc.stroke('#000000') - gc.fill('#000000') - points do |p| px = proj.x(p['longitude']) py = proj.y(p['latitude']) - gc.line(px, py, oldpx, oldpy ) unless first - # puts "C #{px},#{py} - #{oldpx},#{oldpy}" + + gc.dup.line(px, py, oldpx, oldpy).draw(image) unless first + first = false oldpy = py oldpx = px end - canvas = Magick::Image.new(width, height) { - self.background_color = 'white' - } - begin - gc.draw(canvas) - rescue ArgumentError - end - canvas.format = 'GIF' - return canvas.to_blob + return image.to_blob end end @@ -292,7 +300,7 @@ module OSM image = XML::Node.new 'image' @channel << image url = XML::Node.new 'url' - url << 'http://www.openstreetmap.org/feeds/mag_map-rss2.0.png' + url << 'http://www.openstreetmap.org/images/mag_map-rss2.0.png' image << url title = XML::Node.new 'title' title << "OpenStreetMap" @@ -308,7 +316,7 @@ module OSM image << link end - def add(latitude=0, longitude=0, title_text='dummy title', url='http://www.example.com/', description_text='dummy description', timestamp=DateTime.now) + def add(latitude=0, longitude=0, title_text='dummy title', author_text='anonymous', url='http://www.example.com/', description_text='dummy description', timestamp=DateTime.now) item = XML::Node.new 'item' title = XML::Node.new 'title' @@ -326,6 +334,10 @@ module OSM description << description_text item << description + author = XML::Node.new 'author' + author << author_text + item << author + pubDate = XML::Node.new 'pubDate' pubDate << timestamp.to_s(:rfc822) item << pubDate @@ -361,4 +373,56 @@ module OSM return doc end end + + def self.IPLocation(ip_address) + Timeout::timeout(4) do + Net::HTTP.start('api.hostip.info') do |http| + country = http.get("/country.php?ip=#{ip_address}").body + country = "GB" if country == "UK" + Net::HTTP.start('ws.geonames.org') do |http| + xml = REXML::Document.new(http.get("/countryInfo?country=#{country}").body) + xml.elements.each("geonames/country") do |ele| + minlon = ele.get_text("bBoxWest").to_s + minlat = ele.get_text("bBoxSouth").to_s + maxlon = ele.get_text("bBoxEast").to_s + maxlat = ele.get_text("bBoxNorth").to_s + return { :minlon => minlon, :minlat => minlat, :maxlon => maxlon, :maxlat => maxlat } + end + end + end + end + + return nil + rescue Exception + return nil + end + + # Construct a random token of a given length + def self.make_token(length = 30) + chars = 'abcdefghijklmnopqrtuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789' + token = '' + + length.times do + token += chars[(rand * chars.length).to_i].chr + end + + return token + end + + # Return an encrypted version of a password + def self.encrypt_password(password, salt) + return Digest::MD5.hexdigest(password) if salt.nil? + return Digest::MD5.hexdigest(salt + password) + end + + # Return an SQL fragment to select a given area of the globe + def self.sql_for_area(minlat, minlon, maxlat, maxlon, prefix = nil) + tilesql = QuadTile.sql_for_area(minlat, minlon, maxlat, maxlon, prefix) + minlat = (minlat * 10000000).round + minlon = (minlon * 10000000).round + maxlat = (maxlat * 10000000).round + maxlon = (maxlon * 10000000).round + + return "#{tilesql} AND #{prefix}latitude BETWEEN #{minlat} AND #{maxlat} AND #{prefix}longitude BETWEEN #{minlon} AND #{maxlon}" + end end