X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c8971a545c7173274e3018de02ac2f6784b50734..8c029f8d79d07384cffafb82d4b5979181bda8ad:/app/models/old_relation.rb diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb index 390c142db..dc89afa50 100644 --- a/app/models/old_relation.rb +++ b/app/models/old_relation.rb @@ -1,5 +1,6 @@ class OldRelation < ActiveRecord::Base include ConsistencyValidations + include ObjectMetadata self.table_name = "relations" self.primary_keys = "relation_id", "version" @@ -12,7 +13,7 @@ class OldRelation < ActiveRecord::Base belongs_to :redaction belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id" - has_many :old_members, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version], :order => :sequence_id + has_many :old_members, -> { order(:sequence_id) }, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version] has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version] validates_associated :changeset @@ -59,24 +60,13 @@ class OldRelation < ActiveRecord::Base end def members - unless @members - @members = Array.new - OldRelationMember.where(:relation_id => self.relation_id, :version => self.version).order(:sequence_id).each do |m| - @members += [[m.type,m.id,m.role]] - end + @members ||= self.old_members.collect do |member| + [member.member_type, member.member_id, member.member_role] end - @members end def tags - unless @tags - @tags = Hash.new - OldRelationTag.where(:relation_id => self.relation_id, :version => self.version).each do |tag| - @tags[tag.k] = tag.v - end - end - @tags = Hash.new unless @tags - @tags + @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }] end def members=(s) @@ -93,36 +83,23 @@ class OldRelation < ActiveRecord::Base return doc end - def to_xml_node - el1 = XML::Node.new 'relation' - el1['id'] = self.relation_id.to_s - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - if self.changeset.user.data_public? - el1['user'] = self.changeset.user.display_name - el1['uid'] = self.changeset.user.id.to_s - end - el1['version'] = self.version.to_s - el1['changeset'] = self.changeset_id.to_s - - el1['redacted'] = self.redaction.id.to_s if self.redacted? - + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) + el = XML::Node.new 'relation' + el['id'] = self.relation_id.to_s + + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) + self.old_members.each do |member| - e = XML::Node.new 'member' - e['type'] = member.member_type.to_s.downcase - e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML - e['role'] = member.member_role.to_s - el1 << e + 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 - self.old_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end + add_tags_to_xml_node(el, self.old_tags) - return el1 + return el end # Temporary method to match interface to nodes