X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0499559f79926c3a6f1339e93b012637df1c292c..3d6e1c67fb2291c6933f37bac3b9a3f518e8487a:/app/controllers/node_controller.rb?ds=sidebyside

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index 9f8f4a38b..ae5245016 100644
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -51,13 +51,7 @@ class NodeController < ApplicationController
       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.visible = true
-        node.save_with_history!
-
+	update_internal node, new_node
         render :nothing => true
       else
         render :nothing => true, :status => :bad_request
@@ -67,32 +61,54 @@ class NodeController < ApplicationController
     end
   end
 
+  def update_internal(node, new_node)
+    node = Node.find(new_node.id) if node.nil?
+
+    node.user_id = @user.id
+    node.latitude = new_node.latitude 
+    node.longitude = new_node.longitude
+    node.tags = new_node.tags
+    node.visible = true
+    node.save_with_history!
+
+    return true
+  end
+
   # Delete a node. Doesn't actually delete it, but retains its history in a wiki-like way.
   # FIXME remove all the fricking SQL
   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 :text => "", :status => :precondition_failed
-        elsif 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 :text => "", :status => :precondition_failed
-        else
-          node.user_id = @user.id
-          node.visible = 0
-          node.save_with_history!
-
-          render :nothing => true
-        end
+      res = delete_internal(node)
+      unless res
+	render :text => "", :status => :precondition_failed
       else
-        render :text => "", :status => :gone
+	render :text => "", :status => res
       end
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end
   end
 
+  def delete_internal(node)
+    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 ])
+	return false
+      elsif 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]])
+	return false
+      else
+	node.user_id = @user.id
+	node.visible = 0
+	node.save_with_history!
+
+	return :ok
+      end
+    else
+      return :gone
+    end
+  end
+
   # WTF does this do?
   def nodes
     ids = params['nodes'].split(',').collect { |n| n.to_i }