X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fb5f39f19ae00dad9ec896e216e8e813de42c151..85d17f257c338f668a1d17d9fc62a2f48ec84230:/app/controllers/node_controller.rb?ds=inline diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 309b930b7..5064a3c0b 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -3,121 +3,76 @@ class NodeController < ApplicationController require 'xml/libxml' - session :off + skip_before_filter :verify_authenticity_token before_filter :authorize, :only => [:create, :update, :delete] - before_filter :check_write_availability, :only => [:create, :update, :delete] - before_filter :check_read_availability, :except => [:create, :update, :delete] + before_filter :require_allow_write_api, :only => [:create, :update, :delete] + before_filter :require_public_data, :only => [:create, :update, :delete] + before_filter :check_api_writable, :only => [:create, :update, :delete] + before_filter :check_api_readable, :except => [:create, :update, :delete] after_filter :compress_output + around_filter :api_call_handle_error, :api_call_timeout # Create a node from XML. def create - begin - if request.put? - node = Node.from_xml(request.raw_post, true) + assert_method :put - if node - node.create_with_history @user - render :text => node.id.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request - end - else - render :nothing => true, :status => :method_not_allowed - end - rescue OSM::APIError => ex - render ex.render_opts - end + 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? - response.headers['Last-Modified'] = node.timestamp.rfc822 - render :text => node.to_xml.to_s, :content_type => "text/xml" - else - render :text => "", :status => :gone - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + node = Node.find(params[:id]) + if node.visible? + response.last_modified = node.timestamp + render :text => node.to_xml.to_s, :content_type => "text/xml" + else + render :text => "", :status => :gone end end - # Dump a specific version of the node based on the given params[:id] and params[:version] - def version - begin - node = Node.find(:first, :conditions => { :id => params[:id], :version => params[:version] } ) - if node.visible - response.headers['Last-Modified'] = node.timestamp.rfc822 - 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 - end - end - # Update a node from given XML def update - begin - node = Node.find(params[:id]) - new_node = Node.from_xml(request.raw_post) - - if new_node and new_node.id == node.id - node.update_from(new_node, @user) - render :text => node.version.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request - end - rescue OSM::APIVersionMismatchError => ex - render :text => "Version mismatch: Provided " + ex.provided.to_s + - ", server had: " + ex.latest.to_s, :status => :bad_request - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + node = Node.find(params[:id]) + new_node = Node.from_xml(request.raw_post) + + unless new_node and new_node.id == node.id + raise 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. - # FIXME remove all the fricking SQL + # 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]) - new_node = Node.from_xml(request.raw_post) - # FIXME we no longer care about the user, (or maybe we want to check - # that the user of the changeset is the same user as is making this - # little change?) we really care about the - # changeset which must be open, and that the version that we have been - # given is the one that is currently stored in the database - - if new_node and new_node.id == node.id - node.delete_with_history(new_node, @user) - render :nothing => true - else - render :nothing => true, :status => :bad_request - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found - rescue OSM::APIError => ex - render ex.render_opts + node = Node.find(params[:id]) + new_node = Node.from_xml(request.raw_post) + + unless new_node and new_node.id == node.id + raise 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 - # WTF does this do? + # 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 } - if ids.length > 0 - doc = OSM::API.new.get_xml_doc - - Node.find(ids).each do |node| - doc.root << node.to_xml_node - end + if ids.length == 0 + raise 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