Drop explicit lengths from bigint columns

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

diff --git a/app/models/node.rb b/app/models/node.rb
index ad4318487b722839771e0a94b9cfc62561a966bd..baf0c180f3f069260a960e5e56c11670442116df 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -2,14 +2,14 @@
 #
 # Table name: current_nodes
 #
-#  id           :bigint(8)        not null, primary key
+#  id           :bigint           not null, primary key
 #  latitude     :integer          not null
 #  longitude    :integer          not null
-#  changeset_id :bigint(8)        not null
+#  changeset_id :bigint           not null
 #  visible      :boolean          not null
 #  timestamp    :datetime         not null
-#  tile         :bigint(8)        not null
-#  version      :bigint(8)        not null
+#  tile         :bigint           not null
+#  version      :bigint           not null
 #
 # Indexes
 #
@@ -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