X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/73426ea3838a2f92f5b766b51e017d529c456471..e2a6701696761f8f290796a0b4c30df9a7425ea4:/app/models/old_node.rb diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 979f7cb6b..4585ed406 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -26,10 +26,8 @@ class OldNode < ApplicationRecord include GeoRecord - include ConsistencyValidations self.table_name = "nodes" - self.primary_keys = "node_id", "version" # NOTE: this needs to be included after the table name changes, or # the queries generated by Redactable will use the wrong table name. @@ -47,9 +45,9 @@ class OldNode < ApplicationRecord belongs_to :changeset belongs_to :redaction, :optional => true - belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id" + 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", :query_constraints => [:node_id, :version], :inverse_of => :old_node def validate_position errors.add(:base, "Node is not in the world") unless in_world? @@ -87,10 +85,6 @@ class OldNode < ApplicationRecord attr_writer :tags - def tags_as_hash - tags - end - # Pretend we're not in any ways def ways [] @@ -103,7 +97,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