Merge remote-tracking branch 'upstream/pull/4844'

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

diff --git a/app/models/node.rb b/app/models/node.rb
index ad4318487b722839771e0a94b9cfc62561a966bd..825336d16e684ac25fb15c5f4f3294cd652d281d 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -145,7 +145,7 @@ class Node < ApplicationRecord
     # shouldn't be possible to get race conditions.
     Node.transaction do
       lock!
     # 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?
 
       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!
   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
 
       # update changeset first
       self.changeset_id = new_node.changeset_id


@@ -189,7 +189,7 @@ class Node < ApplicationRecord
   end
 
   def create_with_history(user)
   end
 
   def create_with_history(user)

-    check_create_consistency(self, user)
+    check_create_element_consistency(self, user)

     self.version = 0
     self.visible = true
 
     self.version = 0
     self.visible = true