A better optimisation, as suggested by TomH.

This commit is contained in:
Matt Amos 2009-05-11 15:16:36 +00:00
parent 9481a79e71
commit 43988beec3
2 changed files with 12 additions and 11 deletions

View file

@ -238,18 +238,19 @@ class Way < ActiveRecord::Base
raise OSM::APITooManyWayNodesError.new(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 end
# pre-set all the old nodes to OK, as we must have checked them before. # check only the new nodes, for efficiency - old nodes having been checked last time and can't
checked = old_nodes.inject(Hash.new) {|h,n| h[n] = true; h } # be deleted when they're in-use.
new_nds = (self.nds - old_nodes).sort.uniq
self.nds.each do |n| unless new_nds.empty?
unless checked.key? n db_nds = Node.find(:all, :conditions => { :id => new_nds, :visible => true })
node = Node.find(:first, :conditions => ["id = ?", n])
unless node and node.visible if db_nds.length < new_nds.length
raise OSM::APIPreconditionFailedError.new("Way #{self.id} requires the node with id #{n}, which either does not exist, or is not visible.") missing = new_nds - db_nds.collect { |n| n.id }
end raise OSM::APIPreconditionFailedError.new("Way #{self.id} requires the nodes with id in (#{missing.join(',')}), which either do not exist, or are not visible.")
checked[n] = true
end end
end end
return true return true
end end

View file

@ -164,7 +164,7 @@ class WayControllerTest < ActionController::TestCase
# expect failure # expect failure
assert_response :precondition_failed, assert_response :precondition_failed,
"way upload with invalid node did not return '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 # create a way with no nodes
content "<osm><way changeset='#{open_changeset_id}'>" + content "<osm><way changeset='#{open_changeset_id}'>" +