Fix grammar/referred relation id in precondition failed error.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index bd51d6c5013712835e8e811fee50520f230aecdf..035a07eac8e45e657d31d561bace0a19fe26b028 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -149,6 +149,30 @@ class Node < ActiveRecord::Base
     end
   end
 
+  # As above but doesn't throw an error if node is used elsewhere - instead, just silently
+  # returns without deleting the node. Potlatch needs this in case you ask to delete an
+  # off-screen node while deleting a way - it doesn't know whether the node is used
+  # elsewhere or not.
+  def delete_with_history_unless_used!(new_node, user)
+    unless self.visible
+      raise OSM::APIAlreadyDeletedError.new("node", new_node.id)
+    end
+
+    Node.transaction do
+      check_consistency(self, new_node, user)
+      way = WayNode.find(:first, :joins => "INNER JOIN current_ways ON current_ways.id = current_way_nodes.id", 
+                         :conditions => [ "current_ways.visible = ? AND current_way_nodes.node_id = ?", true, self.id ])
+      rel = RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id", 
+                                :conditions => [ "visible = ? AND member_type='Node' and member_id=? ", true, self.id])
+      if way.nil? and rel.nil?
+        self.changeset_id = new_node.changeset_id
+        self.visible = false
+        changeset.update_bbox!(bbox)
+        save_with_history!
+      end
+    end
+  end
+
   def update_from(new_node, user)
     check_consistency(self, new_node, user)
 
@@ -267,7 +291,7 @@ class Node < ActiveRecord::Base
   ##
   # dummy method to make the interfaces of node, way and relation
   # more consistent.
-  def fix_placeholders!(id_map)
+  def fix_placeholders!(id_map, placeholder_id = nil)
     # nodes don't refer to anything, so there is nothing to do here
   end