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 3d53b453a8b41f2e164dbdc42b36a8755045cb2c..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 'digest/md5'
   require 'RMagick'
 
   class Mercator
@@ -295,7 +296,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"
@@ -311,7 +312,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'
@@ -329,6 +330,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
@@ -384,7 +389,25 @@ module OSM
     end
 
     return nil
-  rescue
+  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