cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename update element consistency check

Browse source
This commit is contained in:
Anton Khorev 2024-03-30 10:57:06 +03:00
parent 09f6b83486
commit 349200fb0a
7 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/node.rb
View file

@ -145,7 +145,7 @@ class Node < ApplicationRecord
# shouldn't be possible to get race conditions.
Node.transaction do
lock!
check_consistency(self, new_node, user)
check_update_element_consistency(self, new_node, user)
ways = Way.joins(:way_nodes).where(:visible => true, :current_way_nodes => { :node_id => id }).order(:id)
raise OSM::APIPreconditionFailedError, "Node #{id} is still used by ways #{ways.collect(&:id).join(',')}." unless ways.empty?
@ -166,7 +166,7 @@ class Node < ApplicationRecord
def update_from(new_node, user)
Node.transaction do
lock!
check_consistency(self, new_node, user)
check_update_element_consistency(self, new_node, user)
# update changeset first
self.changeset_id = new_node.changeset_id