X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a7092491b069de43bb8d8c30d3526e7095c5cc98..d8d40cf29e75b2250bac34b246431106f9a478ba:/app/controllers/api/ways_controller.rb?ds=sidebyside diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb index 9af087d83..27c4a1fcc 100644 --- a/app/controllers/api/ways_controller.rb +++ b/app/controllers/api/ways_controller.rb @@ -1,24 +1,28 @@ module Api class WaysController < ApiController - require "xml/libxml" - + before_action :check_api_writable, :only => [: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 :set_request_formats, :except => [:create, :update, :delete] + before_action :check_rate_limit, :only => [: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, 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 @@ -28,19 +32,28 @@ module Api if @way.visible # Render the result - render :formats => [:xml] + respond_to do |format| + format.xml + format.json + end else head :gone end end + def create + 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) - 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 @@ -75,27 +88,15 @@ module Api end # Render the result - render :formats => [:xml] + respond_to do |format| + format.xml + format.json + end else head :gone end 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 - - 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 - render :formats => [:xml] - 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 @@ -106,7 +107,10 @@ module Api @ways = Way.where(:id => wayids, :visible => true) # Render the result - render :formats => [:xml] + respond_to do |format| + format.xml + format.json + end end end end