X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/97aefa23d0606edaee71d04cf6c1a2006689b1fa..0d8e4b4337e9b94b6a9ed85095005a779f69583c:/app/controllers/api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 9cf8977d3..6b36b41ae 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -126,6 +126,14 @@ class ApiController < ApplicationController
 
     doc = OSM::API.new.get_xml_doc
 
+    # add bounds
+    bounds = XML::Node.new 'bounds'
+    bounds['minlat'] = min_lat.to_s
+    bounds['minlon'] = min_lon.to_s
+    bounds['maxlat'] = max_lat.to_s
+    bounds['maxlon'] = max_lon.to_s
+    doc.root << bounds
+
     # get ways
     # find which ways are needed
     ways = Array.new
@@ -168,15 +176,15 @@ class ApiController < ApplicationController
       end
     end 
 
-    relations = visible_nodes.values.collect { |node| node.containing_relations.visible }.flatten +
-                way_ids.collect { |id| Way.find(id).containing_relations.visible }.flatten
+    relations = Relation.find_for_nodes(visible_nodes.keys, :conditions => "visible = 1") +
+                Relation.find_for_ways(way_ids, :conditions => "visible = 1")
 
     # we do not normally return the "other" partners referenced by an relation, 
     # e.g. if we return a way A that is referenced by relation X, and there's 
     # another way B also referenced, that is not returned. But we do make 
     # an exception for cases where an relation references another *relation*; 
     # in that case we return that as well (but we don't go recursive here)
-    relations += relations.collect { |relation| relation.containing_relations.visible }.flatten
+    relations += Relation.find_for_relations(relations.collect { |r| r.id }, :conditions => "visible = 1")
 
     # this "uniq" may be slightly inefficient; it may be better to first collect and output
     # all node-related relations, then find the *not yet covered* way-related ones etc.