X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/29432d5e9fc8d2c7877bacaf08d58502bb682a33..5410fb6cc6973aa59a278b83ac6dc3785b3b815d:/app/models/node.rb?ds=sidebyside
diff --git a/app/models/node.rb b/app/models/node.rb
index 385bc732a..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
@@ -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