Reduce number of nearby people listed to the closest 5 by default, and show friends...

[rails.git] / lib / osm.rb

diff --git a/lib/osm.rb b/lib/osm.rb
index f458c5135ee849003d5cf66e349788cf8d4028c9..45c506e2e9d75882aaf06a125f3f04c6f52f6b20 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -296,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"
@@ -410,4 +410,15 @@ module OSM
     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