Revert Potlatch 0.10 from the trunk - we will keep it on the potlatch_010

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 59988d88bdc98d764e03f5781fbb7a476e4ec163..64b11cf672aabebe946e5473a7da601a500d7201 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -236,7 +236,13 @@ class Way < ActiveRecord::Base
   # delete a way and it's nodes that aren't part of other ways, with history
   def delete_with_relations_and_nodes_and_history(user)
     
-    node_ids_to_delete = self.unique_nodes
+    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 != #{self.id}")
+    
+    node_ids_not_to_delete = way_nodes.collect {|way_node| way_node.node_id}
+
+    node_ids_to_delete = node_ids - node_ids_not_to_delete
 
     # delete the nodes not used by other ways
     node_ids_to_delete.each do |node_id|
@@ -252,16 +258,6 @@ class Way < ActiveRecord::Base
 
   end
 
-  # Find nodes that belong to this way only
-  def unique_nodes
-    node_ids = self.nodes.collect {|node| node.id }
-    if node_ids.length==0 then return [] end
-    node_ids_in_other_ways = []
-    way_nodes = WayNode.find(:all, :conditions => "node_id in (#{node_ids.join(',')}) and id != #{self.id}")
-    node_ids_in_other_ways = way_nodes.collect {|way_node| way_node.node_id}
-    return node_ids - node_ids_in_other_ways
-  end
-
   # Temporary method to match interface to nodes
   def tags_as_hash
     return self.tags