X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4347d9d3b00a8fffe78daa93eac5b490905f9ac8..7b5f590a2d6f6ed253b595d4e3a27ca18289e5ce:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index a5346e87f..ad4318487 100644 --- 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