X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3426976606d30278fcf5ed279d3c95900785c4a5..c661bbf7dba69d265ebcd6431d0a4ab8c5d48430:/app/models/old_node.rb?ds=inline diff --git a/app/models/old_node.rb b/app/models/old_node.rb index 12099498e..4585ed406 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -26,17 +26,14 @@ class OldNode < ApplicationRecord include GeoRecord - include ConsistencyValidations - include ObjectMetadata self.table_name = "nodes" - self.primary_keys = "node_id", "version" - # note this needs to be included after the table name changes, or + # NOTE: this needs to be included after the table name changes, or # 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, @@ -47,10 +44,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", :query_constraints => [:node_id, :version], :inverse_of => :old_node def validate_position errors.add(:base, "Node is not in the world") unless in_world? @@ -69,28 +66,6 @@ class OldNode < ApplicationRecord old_node end - def to_xml - doc = OSM::API.new.get_xml_doc - doc.root << to_xml_node - doc - end - - def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new "node" - el["id"] = node_id.to_s - - add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - - if visible? - el["lat"] = lat.to_s - el["lon"] = lon.to_s - end - - add_tags_to_xml_node(el, old_tags) - - el - end - def save_with_dependencies! save! @@ -105,15 +80,11 @@ class OldNode < ApplicationRecord end def tags - @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }] + @tags ||= old_tags.to_h { |t| [t.k, t.v] } end attr_writer :tags - def tags_as_hash - tags - end - # Pretend we're not in any ways def ways [] @@ -126,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