Use BETWEEN for the node selection in the map API call as MySQL seems to

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index 5f31e31bf3f83f2b232cd1687c0c7b6657d19bff..aab3e1335bf9828bcddae6fe760945d78d44558c 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -12,6 +12,7 @@ module OSM
   require 'rexml/parsers/sax2parser'
   require 'rexml/text'
   require 'xml/libxml'
   require 'rexml/parsers/sax2parser'
   require 'rexml/text'
   require 'xml/libxml'

+  require 'digest/md5'

   require 'RMagick'
 
   class Mercator
   require 'RMagick'
 
   class Mercator


@@ -295,7 +296,7 @@ module OSM
       image = XML::Node.new 'image'
       @channel << image
       url = XML::Node.new 'url'
       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"
       image << url
       title = XML::Node.new 'title'
       title << "OpenStreetMap"


@@ -391,4 +392,22 @@ module OSM
   rescue Exception
     return nil
   end
   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

 end
 end