X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/135ec35a91bcca15637b6436dd7e546468c49690..fea1b5b88de731dd35d1f79d36ec40a8e8a1f6af:/app/models/old_node.rb diff --git a/app/models/old_node.rb b/app/models/old_node.rb index bdf8cb47e..3caf0442b 100644 --- a/app/models/old_node.rb +++ b/app/models/old_node.rb @@ -24,15 +24,14 @@ # nodes_redaction_id_fkey (redaction_id => redactions.id) # -class OldNode < ActiveRecord::Base +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 @@ -69,28 +68,6 @@ class OldNode < ActiveRecord::Base 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,7 +82,7 @@ class OldNode < ActiveRecord::Base 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