X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1f8a68371ad34594cce4aadf5fef229588fd4ddc..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/models/old_relation.rb

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index e2a650511..8e0727743 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,10 +1,21 @@
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
-  
-  set_table_name 'relations'
+  include ObjectMetadata
+
+  self.table_name = "relations"
+  self.primary_keys = "relation_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.
+  include Redactable
 
   belongs_to :changeset
-  
+  belongs_to :redaction
+  belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_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
 
   def self.from_relation(relation)
@@ -12,36 +23,29 @@ class OldRelation < ActiveRecord::Base
     old_relation.visible = relation.visible
     old_relation.changeset_id = relation.changeset_id
     old_relation.timestamp = relation.timestamp
-    old_relation.id = relation.id
+    old_relation.relation_id = relation.id
     old_relation.version = relation.version
     old_relation.members = relation.members
     old_relation.tags = relation.tags
-    return old_relation
+    old_relation
   end
 
   def save_with_dependencies!
-
-    # see comment in old_way.rb ;-)
     save!
-    clear_aggregation_cache
-    clear_association_cache
-    @attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
-
-    # ok, you can touch from here on
 
-    self.tags.each do |k,v|
+    tags.each do |k, v|
       tag = OldRelationTag.new
       tag.k = k
       tag.v = v
-      tag.id = self.id
-      tag.version = self.version
+      tag.relation_id = relation_id
+      tag.version = version
       tag.save!
     end
 
-    self.members.each_with_index do |m,i|
+    members.each_with_index do |m, i|
       member = OldRelationMember.new
-      member.id = [self.id, self.version, i]
-      member.member_type = m[0]
+      member.id = [relation_id, version, i]
+      member.member_type = m[0].classify
       member.member_id = m[1]
       member.member_role = m[2]
       member.save!
@@ -49,92 +53,62 @@ class OldRelation < ActiveRecord::Base
   end
 
   def members
-    unless @members
-        @members = Array.new
-        OldRelationMember.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version], :order => "sequence_id").each do |m|
-            @members += [[m.type,m.id,m.role]]
-        end
+    @members ||= 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.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
-            @tags[tag.k] = tag.v
-        end
-    end
-    @tags = Hash.new unless @tags
-    @tags
-  end
-
-  def members=(s)
-    @members = s
-  end
-
-  def tags=(t)
-    @tags = t
+    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]
   end
 
-#  has_many :relation_segments, :class_name => 'OldRelationSegment', :foreign_key => 'id'
-#  has_many :relation_tags, :class_name => 'OldRelationTag', :foreign_key => 'id'
+  attr_writer :members
 
-  def old_members
-    OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
-  end
-
-  def old_tags
-    OldRelationTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
-  end
+  attr_writer :tags
 
   def to_xml
     doc = OSM::API.new.get_xml_doc
-    doc.root << to_xml_node()
-    return doc
+    doc.root << to_xml_node
+    doc
   end
 
-  def to_xml_node
-    el1 = XML::Node.new 'relation'
-    el1['id'] = self.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
-    
-    self.old_members.each do |member|
-      e = XML::Node.new 'member'
-      e['type'] = member.member_type.to_s
-      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
-    end
- 
-    self.old_tags.each do |tag|
-      e = XML::Node.new 'tag'
-      e['k'] = tag.k
-      e['v'] = tag.v
-      el1 << e
+  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
-    return el1
+
+    add_tags_to_xml_node(el, old_tags)
+
+    el
   end
 
   # Temporary method to match interface to nodes
   def tags_as_hash
-    return self.tags
+    tags
   end
 
   # Temporary method to match interface to relations
   def relation_members
-    return self.old_members
+    old_members
   end
 
   # Pretend we're not in any relations
   def containing_relation_members
-    return []
+    []
+  end
+
+  # check whether this element is the latest version - that is,
+  # has the same version as its "current" counterpart.
+  def is_latest_version?
+    current_relation.version == version
   end
 end