X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..f906373be251d79988335e96e8046c7f001c613b:/app/controllers/relation_controller.rb diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index 25532a95c..059fb8d7e 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -35,9 +35,7 @@ class RelationController < ApplicationController relation = Relation.find(params[:id]) new_relation = Relation.from_xml(request.raw_post) - unless new_relation && new_relation.id == relation.id - raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" - end + raise OSM::APIBadUserInput, "The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})" unless new_relation && new_relation.id == relation.id relation.update_from new_relation, current_user render :plain => relation.version.to_s @@ -123,15 +121,11 @@ class RelationController < ApplicationController end def relations - unless params["relations"] - raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" - end + raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"] ids = params["relations"].split(",").collect(&:to_i) - if ids.empty? - raise OSM::APIBadUserInput, "No relations were given to search for" - end + raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty? doc = OSM::API.new.get_xml_doc