X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75a49786f8bcb76715cf4009ba807a844baae282..3d0b94abdafeb04cbdece55ab21d3fb725d59137:/app/controllers/api/relations_controller.rb diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb index c33840978..69b145268 100644 --- a/app/controllers/api/relations_controller.rb +++ b/app/controllers/api/relations_controller.rb @@ -2,26 +2,21 @@ module Api class RelationsController < ApiController require "xml/libxml" + before_action :check_api_writable, :only => [:create, :update, :delete] + before_action :check_api_readable, :except => [:create, :update, :delete] before_action :authorize, :only => [:create, :update, :delete] authorize_resource before_action :require_public_data, :only => [:create, :update, :delete] - before_action :check_api_writable, :only => [:create, :update, :delete] - before_action :check_api_readable, :except => [:create, :update, :delete] around_action :api_call_handle_error, :api_call_timeout - before_action :default_format_xml - - # Set format to xml unless client requires a specific format - def default_format_xml - request.format = "xml" unless params[:format] - end + before_action :set_request_formats, :except => [:create, :update, :delete] def create assert_method :put - relation = Relation.from_xml(request.raw_post, true) + relation = Relation.from_xml(request.raw_post, :create => true) # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml relation.create_with_history current_user @@ -81,9 +76,9 @@ module Api # 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" && m[1] != relation.id }.map { |m| m[1] } + node_ids = relation.members.select { |m| m[0] == "Node" }.pluck(1) + way_ids = relation.members.select { |m| m[0] == "Way" }.pluck(1) + relation_ids = relation.members.select { |m| m[0] == "Relation" && m[1] != relation.id }.pluck(1) # next load the relations and the ways.