X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/550c4a3a45814fde5c809334c85f1ebc47659a82..65d092a5791d01561cc7b6826377e950a25ad45c:/app/controllers/api/ways_controller.rb diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb index ca4acd611..c4fce48d0 100644 --- a/app/controllers/api/ways_controller.rb +++ b/app/controllers/api/ways_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 ways is required, and must be of the form ways=id[,id[,id...]]" unless params["ways"] - way = Way.from_xml(request.raw_post, :create => true) + ids = params["ways"].split(",").collect(&:to_i) - # Assume that Way.from_xml has thrown an exception if there is an error parsing the xml - way.create_with_history current_user - render :plain => way.id.to_s + raise OSM::APIBadUserInput, "No ways were given to search for" if ids.empty? + + @ways = Way.find(ids) + + # Render the result + respond_to do |format| + format.xml + format.json + end end def show @@ -39,6 +45,16 @@ module Api end end + def create + assert_method :put + + 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 + render :plain => way.id.to_s + end + def update way = Way.find(params[:id]) new_way = Way.from_xml(request.raw_post) @@ -87,22 +103,6 @@ module Api end end - def index - 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) - - raise OSM::APIBadUserInput, "No ways were given to search for" if ids.empty? - - @ways = Way.find(ids) - - # Render the result - respond_to do |format| - format.xml - format.json - end - end - ## # returns all the ways which are currently using the node given in the # :id parameter. note that this used to return deleted ways as well, but