X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/618908319ca4cc33f4e14c2caba245cd7076829a..a0545ba4e524c96e0d7b751e2d856ab672dd78b3:/app/controllers/node_controller.rb

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index fa6759c3b..4a7527734 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -49,10 +49,6 @@ class NodeController < ApplicationController
     begin
       node = Node.find(params[:id])
       new_node = Node.from_xml(request.raw_post)
-      if new_node.version != node.version
-        render :text => "Version mismatch: Provided " + new_node.version.to_s + ", server had: " + node.version.to_s, :status => :bad_request
-        return
-      end  
 
       if new_node and new_node.id == node.id
         node.update_from(new_node, @user)
@@ -60,6 +56,9 @@ class NodeController < ApplicationController
       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
     end
@@ -71,12 +70,12 @@ class NodeController < ApplicationController
     begin
       node = Node.find(params[:id])
       node.delete_with_history(@user)
+
+      render :nothing => true
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
-    rescue OSM::APIAlreadyDeletedError
-      render :text => "", :status => :gone
-    rescue OSM::APIPreconditionFailedError
-      render :text => "", :status => :precondition_failed
+    rescue OSM::APIError => ex
+      render ex.render_opts
     end
   end