Use utility method for error reporting.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 1480361e0b4937140cb0f3feb8ad8233db2d5eae..935a7422ce952e63de14a18ad3b2100716cc6c37 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -205,7 +205,7 @@ class Way < ActiveRecord::Base
 
   def update_from(new_way, user)
     check_consistency(self, new_way, user)
-    unless new_way.preconditions_ok?
+    unless new_way.preconditions_ok?(self.nds)
       raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.")
     end
 
@@ -227,17 +227,25 @@ class Way < ActiveRecord::Base
     save_with_history!
   end
 
-  def preconditions_ok?
+  def preconditions_ok?(old_nodes = [])
     return false if self.nds.empty?
     if self.nds.length > APP_CONFIG['max_number_of_way_nodes']
       raise OSM::APITooManyWayNodesError.new(self.nds.length, APP_CONFIG['max_number_of_way_nodes'])
     end
-    self.nds.each do |n|
-      node = Node.find(:first, :conditions => ["id = ?", n])
-      unless node and node.visible
-        raise OSM::APIPreconditionFailedError.new("The node with id #{n} either does not exist, or is not visible")
+
+    # check only the new nodes, for efficiency - old nodes having been checked last time and can't
+    # be deleted when they're in-use.
+    new_nds = (self.nds - old_nodes).sort.uniq
+
+    unless new_nds.empty?
+      db_nds = Node.find(:all, :conditions => { :id => new_nds, :visible => true })
+
+      if db_nds.length < new_nds.length
+        missing = new_nds - db_nds.collect { |n| n.id }
+        raise OSM::APIPreconditionFailedError.new("Way #{self.id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible.")
       end
     end
+
     return true
   end
 
@@ -253,7 +261,7 @@ class Way < ActiveRecord::Base
       check_consistency(self, new_way, user)
       rel = RelationMember.find(:first, :joins => :relation,
                              :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])
-      raise OSM::APIPreconditionFailedError.new("You need to make sure that the way with id: #{self.id} is not a member of the relation with id #{rel.id}.") if rel
+      raise OSM::APIPreconditionFailedError.new("Way #{self.id} still used by relation #{rel.relation.id}.") if rel
       
       self.changeset_id = new_way.changeset_id
       self.changeset = new_way.changeset