X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/93da9596997444baa576e296e371065a3cb99eb3..3fff377b009ea751bbfc106f079e7a73db8bffb2:/app/controllers/api/ways_controller.rb diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb index a7c876710..f88f3a1d0 100644 --- a/app/controllers/api/ways_controller.rb +++ b/app/controllers/api/ways_controller.rb @@ -11,12 +11,12 @@ module Api before_action :check_api_readable, :except => [:create, :update, :delete] around_action :api_call_handle_error, :api_call_timeout - before_action :set_default_request_format, :except => [:create, :update, :delete] + before_action :set_request_formats, :except => [:create, :update, :delete] def create assert_method :put - way = Way.from_xml(request.raw_post, true) + way = Way.from_xml(request.raw_post, :create => true) # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml way.create_with_history current_user @@ -43,9 +43,7 @@ module Api way = Way.find(params[:id]) new_way = Way.from_xml(request.raw_post) - unless new_way && new_way.id == way.id - raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})" - end + raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})" unless new_way && new_way.id == way.id way.update_from(new_way, current_user) render :plain => way.version.to_s @@ -90,9 +88,7 @@ module Api end def index - unless params["ways"] - raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]" - end + raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]" unless params["ways"] ids = params["ways"].split(",").collect(&:to_i)