X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7609c118843d66c37dd428a2a162a4e15289b6ce..7b5f590a2d6f6ed253b595d4e3a27ca18289e5ce:/app/models/old_node.rb diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 81d8e331f..077039ac3 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -35,7 +35,7 @@ class OldNode < ApplicationRecord # the queries generated by Redactable will use the wrong table name. include Redactable - validates :changeset, :presence => true, :associated => true + validates :changeset, :associated => true validates :latitude, :presence => true, :numericality => { :only_integer => true } validates :longitude, :presence => true, @@ -46,10 +46,10 @@ class OldNode < ApplicationRecord validate :validate_position belongs_to :changeset - belongs_to :redaction - belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id" + belongs_to :redaction, :optional => true + belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id", :inverse_of => :old_nodes - has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version] + has_many :old_tags, :class_name => "OldNodeTag", :foreign_key => [:node_id, :version], :inverse_of => :old_node def validate_position errors.add(:base, "Node is not in the world") unless in_world? @@ -82,7 +82,7 @@ class OldNode < ApplicationRecord end def tags - @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h + @tags ||= old_tags.to_h { |t| [t.k, t.v] } end attr_writer :tags @@ -103,7 +103,7 @@ class OldNode < ApplicationRecord # check whether this element is the latest version - that is, # has the same version as its "current" counterpart. - def is_latest_version? + def latest_version? current_node.version == version end end