X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b2515ec75ebb24ee21c1a28b2ea218013a5fde19..62a1ec47483803a32c038fb2907afdf45a61b5ee:/app/models/way.rb?ds=sidebyside

diff --git a/app/models/way.rb b/app/models/way.rb
index 64b11cf67..59988d88b 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -236,13 +236,7 @@ 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 = 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
+    node_ids_to_delete = self.unique_nodes
 
     # delete the nodes not used by other ways
     node_ids_to_delete.each do |node_id|
@@ -258,6 +252,16 @@ 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