X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b7f306a437f1b0d6960cdafb348a5c15366ec53e..3a599519eb49c2211bbb513fbbda65a05068b9e5:/app/models/way.rb diff --git a/app/models/way.rb b/app/models/way.rb index 92d8f735a..4f988dc9d 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -191,11 +191,6 @@ 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 @@ -209,17 +204,20 @@ class Way < ActiveRecord::Base end def update_from(new_way, user) - check_consistency(self, new_way, user) - unless new_way.preconditions_ok? - raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.") + Way.transaction do + self.lock! + check_consistency(self, new_way, user) + unless new_way.preconditions_ok?(self.nds) + raise OSM::APIPreconditionFailedError.new("Cannot update way #{self.id}: data is invalid.") + end + + self.changeset_id = new_way.changeset_id + self.changeset = new_way.changeset + self.tags = new_way.tags + self.nds = new_way.nds + self.visible = true + save_with_history! end - - self.changeset_id = new_way.changeset_id - self.changeset = new_way.changeset - self.tags = new_way.tags - self.nds = new_way.nds - self.visible = true - save_with_history! end def create_with_history(user) @@ -232,17 +230,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("Way #{self.id} requires the node with id #{n}, which 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 @@ -255,6 +261,7 @@ class Way < ActiveRecord::Base # provide repeatable reads for the used-by checks. this means it # shouldn't be possible to get race conditions. Way.transaction do + self.lock! check_consistency(self, new_way, user) rel = RelationMember.find(:first, :joins => :relation, :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])