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

[rails.git] / app / controllers / api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 39706edf0b3b4e2228aa5c08735eaa4f748b5111..407f6872afe6ec11d6d1c375e8bff98ee1222ea3 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -141,7 +141,7 @@ class ApiController < ApplicationController
     end
 
     # get all the nodes
-    nodes = Node.find(:all, :conditions => ['latitude > ? AND longitude > ? AND latitude < ? AND longitude < ? AND visible = 1', min_lat, min_lon, max_lat, max_lon])
+    nodes = Node.find(:all, :conditions => ['latitude BETWEEN ? AND ? AND longitude BETWEEN ? AND ? AND visible = 1', min_lat, max_lat, min_lon, max_lon])
 
     node_ids = nodes.collect {|node| node.id }
 
@@ -244,6 +244,22 @@ class ApiController < ApplicationController
       
       exit!
     end
+  end
+
+  def capabilities
+    doc = OSM::API.new.get_xml_doc
 
+    api = XML::Node.new 'api'
+    version = XML::Node.new 'version'
+    version['minimum'] = '0.4';
+    version['maximum'] = '0.4';
+    api << version
+    area = XML::Node.new 'area'
+    area['maximum'] = MAX_REQUEST_AREA.to_s;
+    api << area
+    
+    doc.root << api
+
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 end