X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3d0ca940d26bdc23aa791178b01b816185c5a086..901d77837b9c1a432c158f1ed5f9a90bf71b8588:/app/controllers/node_controller.rb?ds=sidebyside

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 3b288e29b..8eb698920 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -3,13 +3,12 @@
 class NodeController < ApplicationController
   require 'xml/libxml'
 
-  session :off
   before_filter :authorize, :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
+  around_filter :api_call_handle_error, :api_call_timeout
 
   # Create a node from XML.
   def create
@@ -17,12 +16,9 @@ class NodeController < ApplicationController
 
     node = Node.from_xml(request.raw_post, true)
 
-    if node
-      node.create_with_history @user
-      render :text => node.id.to_s, :content_type => "text/plain"
-    else
-      raise OSM::APIBadXMLError.new(:node, request.raw_post)
-    end
+    # 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]
@@ -40,13 +36,12 @@ class NodeController < ApplicationController
   def update
     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
+       
+    unless new_node and new_node.id == node.id
+      raise OSM::BadUserInput.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 
@@ -56,28 +51,26 @@ class NodeController < ApplicationController
     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
+    unless new_node and new_node.id == node.id
+      raise OSM::BadUserInput.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 }
 
-    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::BadUserInput.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