X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bf29550db840c97cafffbe1e836750bef6c7942d..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/controllers/relation_controller.rb?ds=inline diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index da5129467..0b989d11e 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -1,81 +1,62 @@ class RelationController < ApplicationController require 'xml/libxml' - session :off + skip_before_filter :verify_authenticity_token before_filter :authorize, :only => [:create, :update, :delete] - before_filter :check_write_availability, :only => [:create, :update, :delete] - before_filter :check_read_availability, :except => [:create, :update, :delete] + before_filter :require_allow_write_api, :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 + around_filter :api_call_handle_error, :api_call_timeout def create - begin - if request.put? - relation = Relation.from_xml(request.raw_post, true) - - if relation - relation.create_with_history @user - render :text => relation.id.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request - end - else - render :nothing => true, :status => :method_not_allowed - end - rescue OSM::APIError => ex - render ex.render_opts - end + assert_method :put + + relation = Relation.from_xml(request.raw_post, true) + + # We assume that an exception has been thrown if there was an error + # generating the relation + #if relation + relation.create_with_history @user + render :text => relation.id.to_s, :content_type => "text/plain" + #else + # render :text => "Couldn't get turn the input into a relation.", :status => :bad_request + #end end def read - begin - relation = Relation.find(params[:id]) - response.headers['Last-Modified'] = relation.timestamp.rfc822 - if relation.visible - render :text => relation.to_xml.to_s, :content_type => "text/xml" - else - render :text => "", :status => :gone - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - rescue - render :nothing => true, :status => :internal_server_error + relation = Relation.find(params[:id]) + response.last_modified = relation.timestamp + if relation.visible + render :text => relation.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end end def update logger.debug request.raw_post - begin - relation = Relation.find(params[:id]) - new_relation = Relation.from_xml(request.raw_post) - - if new_relation and new_relation.id == relation.id - relation.update_from new_relation, @user - render :text => relation.version.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - rescue OSM::APIError => ex - render ex.render_opts + + relation = Relation.find(params[:id]) + new_relation = Relation.from_xml(request.raw_post) + + if new_relation and new_relation.id == relation.id + relation.update_from new_relation, @user + render :text => relation.version.to_s, :content_type => "text/plain" + else + render :nothing => true, :status => :bad_request end end def delete -#XXX check if member somewhere! - begin - relation = Relation.find(params[:id]) - new_relation = Relation.from_xml(request.raw_post) - if new_relation and new_relation.id == relation.id - relation.delete_with_history!(new_relation, @user) - render :text => relation.version.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request - end - rescue OSM::APIError => ex - render ex.render_opts - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + relation = Relation.find(params[:id]) + new_relation = Relation.from_xml(request.raw_post) + if new_relation and new_relation.id == relation.id + relation.delete_with_history!(new_relation, @user) + render :text => relation.version.to_s, :content_type => "text/plain" + else + render :nothing => true, :status => :bad_request end end @@ -88,68 +69,63 @@ class RelationController < ApplicationController # members, plus all nodes part of member ways # ----------------------------------------------------------------- def full - begin - relation = Relation.find(params[:id]) - - if relation.visible - - # first collect nodes, ways, and relations referenced by this relation. - - ways = Way.find_by_sql("select w.* from current_ways w,current_relation_members rm where "+ - "rm.member_type='way' and rm.member_id=w.id and rm.id=#{relation.id}"); - nodes = Node.find_by_sql("select n.* from current_nodes n,current_relation_members rm where "+ - "rm.member_type='node' and rm.member_id=n.id and rm.id=#{relation.id}"); - # note query is built to exclude self just in case. - relations = Relation.find_by_sql("select r.* from current_relations r,current_relation_members rm where "+ - "rm.member_type='relation' and rm.member_id=r.id and rm.id=#{relation.id} and r.id<>rm.id"); - - # now additionally collect nodes referenced by ways. Note how we recursively - # evaluate ways but NOT relations. - - node_ids = nodes.collect {|node| node.id } - way_node_ids = ways.collect { |way| - way.way_nodes.collect { |way_node| way_node.node_id } - } - way_node_ids.flatten! - way_node_ids.uniq - way_node_ids -= node_ids - nodes += Node.find(way_node_ids) + relation = Relation.find(params[:id]) - # create XML. - doc = OSM::API.new.get_xml_doc - visible_nodes = {} - 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) - visible_nodes[node.id] = node - end + if relation.visible + + # first find the ids of nodes, ways and relations referenced by this + # relation - note that we exclude this relation just in case. + + node_ids = relation.members.select { |m| m[0] == 'Node' }.map { |m| m[1] } + way_ids = relation.members.select { |m| m[0] == 'Way' }.map { |m| m[1] } + relation_ids = relation.members.select { |m| m[0] == 'Relation' and m[1] != relation.id }.map { |m| m[1] } + + # next load the relations and the ways. + + relations = Relation.where(:id => relation_ids).includes(:relation_tags) + ways = Way.where(:id => way_ids).includes(:way_nodes, :way_tags) + + # now additionally collect nodes referenced by ways. Note how we + # recursively evaluate ways but NOT relations. + + way_node_ids = ways.collect { |way| + way.way_nodes.collect { |way_node| way_node.node_id } + } + node_ids += way_node_ids.flatten + nodes = Node.where(:id => node_ids.uniq).includes(:node_tags) + + # create XML. + doc = OSM::API.new.get_xml_doc + visible_nodes = {} + visible_members = { "Node" => {}, "Way" => {}, "Relation" => {} } + 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(changeset_cache, user_display_name_cache) + visible_nodes[node.id] = node + visible_members["Node"][node.id] = true 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) - end + end + ways.each do |way| + if way.visible? # should be unnecessary if data is consistent. + doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) + visible_members["Way"][way.id] = true 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) - end + end + relations.each do |rel| + if rel.visible? # should be unnecessary if data is consistent. + doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache) + visible_members["Relation"][rel.id] = true end - # finally add self and output - doc.root << relation.to_xml_node(user_display_name_cache) - render :text => doc.to_s, :content_type => "text/xml" - - else - - render :text => "", :status => :gone end - - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - - rescue - render :nothing => true, :status => :internal_server_error + # finally add self and output + doc.root << relation.to_xml_node(visible_members, changeset_cache, user_display_name_cache) + render :text => doc.to_s, :content_type => "text/xml" + + else + render :nothing => true, :status => :gone end end @@ -165,22 +141,24 @@ class RelationController < ApplicationController render :text => doc.to_s, :content_type => "text/xml" else - render :nothing => true, :status => :bad_request + render :text => "You need to supply a comma separated list of ids.", :status => :bad_request end end def relations_for_way - relations_for_object("way") + relations_for_object("Way") end + def relations_for_node - relations_for_object("node") + relations_for_object("Node") end + def relations_for_relation - relations_for_object("relation") + relations_for_object("Relation") end def relations_for_object(objtype) - relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq + relationids = RelationMember.where(:member_type => objtype, :member_id => params[:id]).collect { |ws| ws.relation_id }.uniq doc = OSM::API.new.get_xml_doc