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

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

diff --git a/app/models/node.rb b/app/models/node.rb
index a5346e87f39b71f297b9b6b4948d01f271d2618e..ad4318487b722839771e0a94b9cfc62561a966bd 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -27,13 +27,12 @@ class Node < ApplicationRecord
   include GeoRecord
   include ConsistencyValidations
   include NotRedactable
-  include ObjectMetadata
 
   self.table_name = "current_nodes"
 
   belongs_to :changeset
 
-  has_many :old_nodes, -> { order(:version) }
+  has_many :old_nodes, -> { order(:version) }, :inverse_of => :current_node
 
   has_many :way_nodes
   has_many :ways, :through => :way_nodes
@@ -50,8 +49,6 @@ class Node < ApplicationRecord
                  :numericality => { :on => :update, :only_integer => true }
   validates :version, :presence => true,
                       :numericality => { :only_integer => true }
-  validates :changeset_id, :presence => true,
-                           :numericality => { :only_integer => true }
   validates :latitude, :presence => true,
                        :numericality => { :only_integer => true }
   validates :longitude, :presence => true,
@@ -207,7 +204,7 @@ class Node < ApplicationRecord
   end
 
   def tags
-    @tags ||= Hash[node_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= node_tags.to_h { |t| [t.k, t.v] }
   end
 
   attr_writer :tags
@@ -239,7 +236,7 @@ class Node < ApplicationRecord
   private
 
   def save_with_history!
-    t = Time.now.getutc
+    t = Time.now.utc
 
     self.version += 1
     self.timestamp = t