Handle deleted items better.

[rails.git] / app / models / way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index f95037ea13466832349bf5f261a1a09e21c0d2ba..f1dc76eb4c6b65053214e1e80f6665f70ad10052 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -210,10 +210,13 @@ class Way < ActiveRecord::Base
   # Delete the way and it's relations, but don't really delete it - set its visibility to false and update the history etc to maintain wiki-like functionality.
   def delete_with_relations_and_history(user)
     if self.visible
-      # omg FIXME
+         # FIXME
+         # this should actually delete the relations,
+         # not just throw a PreconditionFailed if it's a member of a relation!!
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
                              :conditions => [ "visible = 1 AND member_type='way' and member_id=?", self.id])
         raise OSM::APIPreconditionFailedError
+      # end FIXME
       else
         self.user_id = user.id
         self.tags = []
@@ -227,38 +230,27 @@ class Way < ActiveRecord::Base
   end
 
   # delete a way and it's nodes that aren't part of other ways, with history
-  # WARNING, INCOMPLETE - Read the code
   def delete_with_relations_and_nodes_and_history(user)
-    return false # until complete, just return false
     
     node_ids = self.nodes.collect {|node| node.id }
     node_ids_not_to_delete = []
-    way_nodes = WayNode.find(:all, :conditions => "node_id in [#{node_ids.join(',')}] and id not #{self.id}")
+    way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}")
     
     node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id}
 
-    nodes_to_delete = node_ids - node_ids_not_to_delete
+    node_ids_to_delete = node_ids - node_ids_not_to_delete
 
-    # update the visibility etc on the current nodes
-    update_time = Time.now()
-    
-    Node.update(node_ids_to_delete, {:user_id => user.id, :timestamp => update_time, :visibility => false})
-
-    # create old nodes
-
-    old_nodes_to_create = []
-    OldNode.find(node_ids_to_delete).each do |old_node|
-      old_nodes_to_create << {:id => old_node.id, :timestamp => update_time, :latitude => old_node.latitude, :longitude => old_node.longitude, :visible => false}
+    # delete the nodes not used by other ways
+    node_ids_to_delete.each do |node_id|
+      n = Node.find(node_id)
+      n.user_id = user.id
+      n.visible = false
+      n.save_with_history!
     end
-
-    OldNode.create(old_nodes_to_create)
-
-    # FIXME - the old nodes need to have their tile updated and I have no idea how that works
-    # they also need their tags copied over, and that depends on normalising the tags out to their own table that nicks working on
-
-    # finally, delete the way
     
-    self.delete_with_relations_and_history
+    self.user_id = user.id
+
+    self.delete_with_relations_and_history(user)
 
   end
 end