Remove a rescue, which is stopping a more detailed error message being returned to...

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

diff --git a/app/models/way.rb b/app/models/way.rb
index 16c93f608b5ddc3d93b77cdbe419354244194539..f608dccc88c71b774b0073ddc98bc2db93f034f2 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -191,6 +191,11 @@ class Way < ActiveRecord::Base
     # in the hash to be overwritten.
     raise OSM::APIDuplicateTagsError.new("way", self.id, k) if @tags.include? k
 
+    # check tag size here, as we don't create a WayTag object until
+    # just before we save...
+    raise OSM::APIBadUserInput.new("Way #{self.id} has a tag with too long a key, '#{k}'.") if k.length > 255
+    raise OSM::APIBadUserInput.new("Way #{self.id} has a tag with too long a value, '#{k}'='#{v}'.") if v.length > 255
+
     @tags[k] = v
   end
 
@@ -205,7 +210,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 +232,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