X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..bf31791f65fee149b660c1395d59204309f906fa:/app/controllers/relation_controller.rb diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index 3d3fa2185..440c69550 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -3,6 +3,7 @@ class RelationController < ApplicationController session :off before_filter :authorize, :only => [:create, :update, :delete] + before_filter :require_public_data, :only => [:create, :update, :delete] before_filter :check_api_writable, :only => [:create, :update, :delete] before_filter :check_api_readable, :except => [:create, :update, :delete] after_filter :compress_output @@ -119,26 +120,27 @@ class RelationController < ApplicationController # create XML. doc = OSM::API.new.get_xml_doc visible_nodes = {} + changeset_cache = {} user_display_name_cache = {} nodes.each do |node| if node.visible? # should be unnecessary if data is consistent. - doc.root << node.to_xml_node(user_display_name_cache) + doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) visible_nodes[node.id] = node end end ways.each do |way| if way.visible? # should be unnecessary if data is consistent. - doc.root << way.to_xml_node(visible_nodes, user_display_name_cache) + doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) end end relations.each do |rel| if rel.visible? # should be unnecessary if data is consistent. - doc.root << rel.to_xml_node(user_display_name_cache) + doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache) end end # finally add self and output - doc.root << relation.to_xml_node(user_display_name_cache) + doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache) render :text => doc.to_s, :content_type => "text/xml" else