X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f1c6a87aa137c11d0aff5a4b0e563ac2c2a8f82d..fea1b5b88de731dd35d1f79d36ec40a8e8a1f6af:/app/models/old_relation.rb diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index c0025653f..29edb90ad 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -22,12 +22,11 @@ class OldRelation < ApplicationRecord include ConsistencyValidations - include ObjectMetadata self.table_name = "relations" self.primary_keys = "relation_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 @@ -83,37 +82,10 @@ class OldRelation < 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 :members - - attr_writer :tags - - 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 "relation" - el["id"] = relation_id.to_s - - add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - - old_members.each do |member| - member_el = XML::Node.new "member" - member_el["type"] = member.member_type.to_s.downcase - member_el["ref"] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML - member_el["role"] = member.member_role.to_s - el << member_el - end - - add_tags_to_xml_node(el, old_tags) - - el - end + attr_writer :members, :tags # Temporary method to match interface to relations def relation_members