X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/78b440ffc1e0448f8a6d73c8821dd58634ffb475..77e8a16a153752b919a9153c1c9ded9834d387f7:/app/controllers/node_controller.rb?ds=inline diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 8bfe2a612..4880c46be 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -1,117 +1,83 @@ +# The NodeController is the RESTful interface to Node objects + class NodeController < ApplicationController - require 'xml/libxml' + require "xml/libxml" - session :off - before_filter :authorize, :only => [:create, :update, :delete] - before_filter :check_availability, :only => [:create, :update, :delete] - after_filter :compress_output + skip_before_action :verify_authenticity_token + before_action :authorize, :only => [:create, :update, :delete] + before_action :require_allow_write_api, :only => [:create, :update, :delete] + 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 + # Create a node from XML. def create - if request.put? - node = Node.from_xml(request.raw_post, true) - - if node - node.user_id = @user.id - node.visible = true - - if node.save_with_history - render :text => node.id.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :internal_server_error - end - else - render :nothing => true, :status => :bad_request - end - else - render :nothing => true, :status => :method_not_allowed - end + assert_method :put + + node = Node.from_xml(request.raw_post, true) + + # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml + node.create_with_history @user + render :text => node.id.to_s, :content_type => "text/plain" end + # Dump the details on a node given in params[:id] def read - begin - node = Node.find(params[:id]) - - if node.visible - render :text => node.to_xml.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :gone - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - rescue - render :nothing => true, :status => :internal_server_error + node = Node.find(params[:id]) + + response.last_modified = node.timestamp + + if node.visible + render :text => node.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end end + # Update a node from given XML def update - begin - node = Node.find(params[:id]) - - if node.visible - new_node = Node.from_xml(request.raw_post) - - if new_node and new_node.id == node.id - node.user_id = @user.id - node.latitude = new_node.latitude - node.longitude = new_node.longitude - node.tags = new_node.tags - - if node.save_with_history - render :nothing => true - else - render :nothing => true, :status => :internal_server_error - end - else - render :nothing => true, :status => :bad_request - end - else - render :nothing => true, :status => :gone - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - rescue - render :nothing => true, :status => :internal_server_error + node = Node.find(params[:id]) + new_node = Node.from_xml(request.raw_post) + + unless new_node && new_node.id == node.id + fail OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})") end + node.update_from(new_node, @user) + render :text => node.version.to_s, :content_type => "text/plain" end + # Delete a node. Doesn't actually delete it, but retains its history + # in a wiki-like way. We therefore treat it like an update, so the delete + # method returns the new version number. def delete - begin - node = Node.find(params[:id]) - - if node.visible - if WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", :conditions => [ "current_ways.visible = 1 AND current_way_nodes.node_id = ?", node.id ]) - render :nothing => true, :status => :precondition_failed - else if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", :conditions => [ "visible = 1 AND member_type='node' and member_id=?", params[:id]]) - render :nothing => true, :status => :precondition_failed - else - node.user_id = @user.id - node.visible = 0 - node.save_with_history - render :nothing => true - end - else - render :nothing => true, :status => :gone - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - rescue - render :nothing => true, :status => :internal_server_error + node = Node.find(params[:id]) + new_node = Node.from_xml(request.raw_post) + + unless new_node && new_node.id == node.id + fail OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})") end + node.delete_with_history!(new_node, @user) + render :text => node.version.to_s, :content_type => "text/plain" end + # Dump the details on many nodes whose ids are given in the "nodes" parameter. def nodes - ids = params['nodes'].split(',').collect { |n| n.to_i } + unless params["nodes"] + fail OSM::APIBadUserInput.new("The parameter nodes is required, and must be of the form nodes=id[,id[,id...]]") + end - if ids.length > 0 - doc = OSM::API.new.get_xml_doc + ids = params["nodes"].split(",").collect(&:to_i) - Node.find(ids).each do |node| - doc.root << node.to_xml_node - end + if ids.length == 0 + fail OSM::APIBadUserInput.new("No nodes were given to search for") + end + doc = OSM::API.new.get_xml_doc - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :bad_request + Node.find(ids).each do |node| + doc.root << node.to_xml_node end + + render :text => doc.to_s, :content_type => "text/xml" end end