From: Matt Amos <zerebubuth@gmail.com>
Date: Mon, 11 May 2009 15:16:36 +0000 (+0000)
Subject: A better optimisation, as suggested by TomH.
X-Git-Tag: live~7438
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/43988beec3fd4da67b2cacad771ca339ef60a8ab

A better optimisation, as suggested by TomH.
---

diff --git a/app/models/way.rb b/app/models/way.rb
index b1057f673..f608dccc8 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -237,19 +237,20 @@ class Way < ActiveRecord::Base
     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
-    
-    # pre-set all the old nodes to OK, as we must have checked them before.
-    checked = old_nodes.inject(Hash.new) {|h,n| h[n] = true; h }
-
-    self.nds.each do |n|
-      unless checked.key? n
-        node = Node.find(:first, :conditions => ["id = ?", n])
-        unless node and node.visible
-          raise OSM::APIPreconditionFailedError.new("Way #{self.id} requires the node with id #{n}, which either does not exist, or is not visible.")
-        end
-        checked[n] = true
+
+    # 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
 
diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index 862e700a6..cf123972a 100644
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -164,7 +164,7 @@ class WayControllerTest < ActionController::TestCase
     # expect failure
     assert_response :precondition_failed, 
         "way upload with invalid node did not return 'precondition failed'"
-    assert_equal "Precondition failed: Way  requires the node with id 0, which either does not exist, or is not visible.", @response.body
+    assert_equal "Precondition failed: Way  requires the nodes with id in (0), which either do not exist, or are not visible.", @response.body
 
     # create a way with no nodes
     content "<osm><way changeset='#{open_changeset_id}'>" +