More work on export tab.

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 36ce88acd135e7a8cfe56d98b36dd5a1fe9c8cbb..3ef5e753aef135fc6f7fbe0ddfc162bcbc6803d3 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -79,8 +79,9 @@ class ApiController < ApplicationController
       exit!
     end
 
-    render :text => doc.to_s, :content_type => "text/xml"
+    response.headers("Content-Disposition") = "attachment; filename=\"map.osm\""
 
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 
   def map
@@ -132,11 +133,11 @@ class ApiController < ApplicationController
     ways = Array.new
     if node_ids.length > 0
       way_nodes = WayNode.find_all_by_node_id(node_ids)
-      way_ids = way_nodes.collect {|way_node| way_node.id[0] }
+      way_ids = way_nodes.collect { |way_node| way_node.id[0] }
       ways = Way.find(way_ids)
 
       list_of_way_nodes = ways.collect { |way|
-             way.way_nodes.collect { |way_node| way_node.node_id }
+        way.way_nodes.collect { |way_node| way_node.node_id }
       }
       list_of_way_nodes.flatten!
 
@@ -169,20 +170,8 @@ class ApiController < ApplicationController
       end
     end 
 
-    # collect relationships. currently done in one big block at the end;
-    # may need to move this upwards if people want automatic completion of
-    # relationships, i.e. deliver referenced objects like we do with ways...
-    relations = Array.new
-    if visible_nodes.length > 0
-        relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +
-            "e.visible=1 and " +
-            "em.id = e.id and em.member_type='node' and em.member_id in (#{visible_nodes.keys.join(',')})")
-    end
-    if way_ids.length > 0
-        relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +
-            "e.visible=1 and " +
-            "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})")
-    end
+    relations = Relation.find_for_nodes_and_ways(visible_nodes.keys, way_ids)
+
     # 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