X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/603af36a83421a961afddc1604eabfea97f625ba..b7b2b502cf2b119208e3c1f79e4a4e38cc0edcc5:/app/controllers/relation_controller.rb diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index 8019fb56a..cdd1d34d6 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -1,43 +1,39 @@ class RelationController < ApplicationController require 'xml/libxml' + session :off before_filter :authorize, :only => [:create, :update, :delete] - before_filter :check_availability, :only => [:create, :update, :delete] - + before_filter :check_write_availability, :only => [:create, :update, :delete] + before_filter :check_read_availability, :except => [:create, :update, :delete] after_filter :compress_output def create - if request.put? - relation = Relation.from_xml(request.raw_post, true) + begin + if request.put? + relation = Relation.from_xml(request.raw_post, true) - if relation - if !relation.preconditions_ok? - render :nothing => true, :status => :precondition_failed + if relation + relation.create_with_history @user + render :text => relation.id.to_s, :content_type => "text/plain" else - relation.user_id = @user.id - - if relation.save_with_history - render :text => relation.id.to_s, :content_type => "text/plain" - else - render :text => "save error", :status => :internal_server_error - end + render :nothing => true, :status => :bad_request end else - render :nothing => true, :status => :bad_request + render :nothing => true, :status => :method_not_allowed end - else - render :nothing => true, :status => :method_not_allowed + rescue OSM::APIError => ex + render ex.render_opts 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 :nothing => true, :status => :gone + render :text => "", :status => :gone end rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found @@ -47,37 +43,21 @@ class RelationController < ApplicationController end def update + logger.debug request.raw_post begin relation = Relation.find(params[:id]) + new_relation = Relation.from_xml(request.raw_post) - if relation.visible - new_relation = Relation.from_xml(request.raw_post) - - if new_relation and new_relation.id == relation.id - if !new_relation.preconditions_ok? - render :nothing => true, :status => :precondition_failed - else - relation.user_id = @user.id - relation.tags = new_relation.tags - relation.members = new_relation.members - relation.visible = true - - if relation.save_with_history - render :nothing => true - else - render :nothing => true, :status => :internal_server_error - end - end - else - render :nothing => true, :status => :bad_request - end + 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 => :gone + render :nothing => true, :status => :bad_request end rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found - rescue - render :nothing => true, :status => :internal_server_error + rescue OSM::APIError => ex + render ex.render_opts end end @@ -85,62 +65,89 @@ class RelationController < ApplicationController #XXX check if member somewhere! begin relation = Relation.find(params[:id]) - - if relation.visible - if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='relation' and member_id=?", params[:id]]) - render :nothing => true, :status => :precondition_failed - else - relation.user_id = @user.id - relation.tags = [] - relation.members = [] - relation.visible = false - - if relation.save_with_history - render :nothing => true - else - render :nothing => true, :status => :internal_server_error - end - end + 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 => :gone + render :nothing => true, :status => :bad_request end + rescue OSM::APIError => ex + render ex.render_opts rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found - rescue - render :nothing => true, :status => :internal_server_error end end + # ----------------------------------------------------------------- + # full + # + # input parameters: id + # + # returns XML representation of one relation object plus all its + # members, plus all nodes part of member ways + # ----------------------------------------------------------------- def full begin relation = Relation.find(params[:id]) if relation.visible - # In future, we might want to do all the data fetch in one step - seg_ids = relation.segs + [-1] - segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})" - node_ids = segments.collect {|segment| segment.node_a } - node_ids += segments.collect {|segment| segment.node_b } - node_ids += [-1] - nodes = Node.find(node_ids, :conditions => "visible = TRUE") - - # Render + # 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) + + # create XML. doc = OSM::API.new.get_xml_doc + visible_nodes = {} + user_display_name_cache = {} + nodes.each do |node| - doc.root << node.to_xml_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 end - segments.each do |segment| - doc.root << segment.to_xml_node() + 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 - doc.root << relation.to_xml_node() - + 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 + # 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 :nothing => true, :status => :gone + + render :text => "", :status => :gone end + rescue ActiveRecord::RecordNotFound render :nothing => true, :status => :not_found + rescue render :nothing => true, :status => :internal_server_error end @@ -162,19 +169,25 @@ class RelationController < ApplicationController end end - def relations_for_object(objtype) - relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id }.uniq + def relations_for_way + relations_for_object("way") + end + def relations_for_node + relations_for_object("node") + end + def relations_for_relation + relations_for_object("relation") + end - if relationids.length > 0 - doc = OSM::API.new.get_xml_doc + def relations_for_object(objtype) + relationids = RelationMember.find(:all, :conditions => ['member_type=? and member_id=?', objtype, params[:id]]).collect { |ws| ws.id[0] }.uniq - Relation.find(relationids).each do |relation| - doc.root << relation.to_xml_node - end + doc = OSM::API.new.get_xml_doc - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :bad_request + Relation.find(relationids).each do |relation| + doc.root << relation.to_xml_node if relation.visible end + + render :text => doc.to_s, :content_type => "text/xml" end end