X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/460ed0c844d6d2dbb23f44f994461c4585d8ab45..2c497aee7a45c31ae6d1a448c35ce1b3f0ebb608:/app/controllers/api/relations_controller.rb?ds=sidebyside diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb index 69b145268..19aed6a85 100644 --- a/app/controllers/api/relations_controller.rb +++ b/app/controllers/api/relations_controller.rb @@ -13,14 +13,20 @@ module Api before_action :set_request_formats, :except => [:create, :update, :delete] - def create - assert_method :put + def index + raise OSM::APIBadUserInput, "The parameter relations is required, and must be of the form relations=id[,id[,id...]]" unless params["relations"] - relation = Relation.from_xml(request.raw_post, :create => true) + ids = params["relations"].split(",").collect(&:to_i) - # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml - relation.create_with_history current_user - render :plain => relation.id.to_s + raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty? + + @relations = Relation.find(ids) + + # Render the result + respond_to do |format| + format.xml + format.json + end end def show @@ -37,6 +43,16 @@ module Api end end + def create + assert_method :put + + 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 + render :plain => relation.id.to_s + end + def update logger.debug request.raw_post @@ -131,22 +147,6 @@ module Api end end - def index - 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) - - raise OSM::APIBadUserInput, "No relations were given to search for" if ids.empty? - - @relations = Relation.find(ids) - - # Render the result - respond_to do |format| - format.xml - format.json - end - end - def relations_for_way relations_for_object("Way") end