X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/45487e1ff8e7d334792440a2b5b3b1067269bfaf..771b75ed71198811a6661a146e3376f0489771d8:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index ad4318487..1bec9a33c 100644 --- 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! - 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 @@ -189,7 +189,7 @@ class Node < ApplicationRecord end def create_with_history(user) - check_create_consistency(self, user) + check_create_element_consistency(self, user) self.version = 0 self.visible = true @@ -199,10 +199,6 @@ class Node < ApplicationRecord save_with_history! end - def tags_as_hash - tags - end - def tags @tags ||= node_tags.to_h { |t| [t.k, t.v] } end