X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/951564eed1c82ec1a435f4e4636db86d1b7604fc..0babf982564e1dd1e096cbae09d62436729f703a:/app/controllers/api/ways_controller.rb?ds=inline diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb index 5e3e5e11a..27c4a1fcc 100644 --- a/app/controllers/api/ways_controller.rb +++ b/app/controllers/api/ways_controller.rb @@ -1,45 +1,59 @@ 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 - way = Way.find(params[:id]) + @way = Way.find(params[:id]) - response.last_modified = way.timestamp + response.last_modified = @way.timestamp - if way.visible - render :xml => way.to_xml.to_s + if @way.visible + # Render the result + 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 @@ -59,46 +73,30 @@ module Api end def full - way = Way.includes(:nodes => :node_tags).find(params[:id]) + @way = Way.includes(:nodes => :node_tags).find(params[:id]) - if way.visible + if @way.visible visible_nodes = {} - changeset_cache = {} - user_display_name_cache = {} - doc = OSM::API.new.get_xml_doc - way.nodes.uniq.each do |node| + @nodes = [] + + @way.nodes.uniq.each do |node| if node.visible - doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) + @nodes << node visible_nodes[node.id] = node end end - doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) - render :xml => doc.to_s + # Render the result + 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? - - doc = OSM::API.new.get_xml_doc - - Way.find(ids).each do |way| - doc.root << way.to_xml_node - end - - render :xml => doc.to_s - 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,13 +104,13 @@ module Api def ways_for_node wayids = WayNode.where(:node_id => params[:id]).collect { |ws| ws.id[0] }.uniq - doc = OSM::API.new.get_xml_doc + @ways = Way.where(:id => wayids, :visible => true) - Way.find(wayids).each do |way| - doc.root << way.to_xml_node if way.visible + # Render the result + respond_to do |format| + format.xml + format.json end - - render :xml => doc.to_s end end end