some more progress towards making amf_controller do version checking of nodes before...

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 0dca302ed77df4fbbd9b4ed6f2bac424de3f0ce2..14ad2147a299700bb270a43b5125bcdca3adf04a 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -702,7 +702,17 @@ class AmfController < ApplicationController
       end
       deleteitemrelations(way_id, 'way')
 
       end
       deleteitemrelations(way_id, 'way')
 

-      way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)
+   
+      #way.delete_with_relations_and_nodes_and_history(changeset_id.to_i)
+      way.unshared_node_ids.each do |node_id|
+        # delete the node
+        node = Node.find(node_id)
+        delete_node = Node.new
+        delete_node.id = node_id
+        delete_node.version = node_id_version[node_id]
+        node.delete_with_history!(delete_node, user)
+      end
+      # delete the way

     end
     [0, way_id]
   end
     end
     [0, way_id]
   end


@@ -711,6 +721,11 @@ class AmfController < ApplicationController
   # ====================================================================
   # Support functions
 
   # ====================================================================
   # Support functions
 

+  # delete a way and its nodes that aren't part of other ways
+  # this functionality used to be in the model, however it is specific to amf
+  # controller
+  #def delete_unshared_nodes(changeset_id, way_id)
+  

   # Remove a node or way from all relations
   # FIXME needs version, changeset, and user
   def deleteitemrelations(objid, type, version) #:doc:
   # Remove a node or way from all relations
   # FIXME needs version, changeset, and user
   def deleteitemrelations(objid, type, version) #:doc: