X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0975858cdb3430a7f717b3c972c3d6eb6e205784..d5d6698faebc55caa6b5df04263e389af09e2c2e:/app/controllers/node_controller.rb?ds=sidebyside diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 4e2a9b7f2..eeaba6199 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -1,91 +1,70 @@ +# The NodeController is the RESTful interface to Node objects + class NodeController < ApplicationController require 'xml/libxml' session :off before_filter :authorize, :only => [:create, :update, :delete] - before_filter :check_availability, :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 - if request.put? - node = Node.from_xml(request.raw_post, true) + assert_method :put - if node - node.user_id = @user.id - node.visible = true - node.save_with_history! + node = Node.from_xml(request.raw_post, true) - render :text => node.id.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request - end + if node + node.create_with_history @user + render :text => node.id.to_s, :content_type => "text/plain" else - render :nothing => true, :status => :method_not_allowed + raise OSM::APIBadXMLError.new(:node, request.raw_post) end 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 + 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 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 - node.save_with_history! - - render :nothing => true - else - render :nothing => true, :status => :bad_request - end - else - render :nothing => true, :status => :gone - end - rescue ActiveRecord::RecordNotFound - render :nothing => true, :status => :not_found + 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 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 Segment.find(:first, :conditions => [ "visible = 1 and (node_a = ? or node_b = ?)", node.id, node.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 + node = Node.find(params[:id]) + new_node = Node.from_xml(request.raw_post) + + if new_node and new_node.id == node.id + node.delete_with_history!(new_node, @user) + render :text => node.version.to_s, :content_type => "text/plain" + else + render :nothing => true, :status => :bad_request end 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 }