Put back missing divider. Closes #1939.

[rails.git] / app / models / old_relation.rb

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 10c76a758cc4561dfbf2babb89bc0f9f4358dd21..ca43b59127c923b6dde9d0e6cebcb2ae9136807b 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,7 +1,11 @@
 class OldRelation < ActiveRecord::Base
 class OldRelation < ActiveRecord::Base

+  include ConsistencyValidations
+  

   set_table_name 'relations'
 
   belongs_to :changeset
   set_table_name 'relations'
 
   belongs_to :changeset

+  
+  validates_associated :changeset

 
   def self.from_relation(relation)
     old_relation = OldRelation.new
 
   def self.from_relation(relation)
     old_relation = OldRelation.new


@@ -21,7 +25,7 @@ class OldRelation < ActiveRecord::Base
     save!
     clear_aggregation_cache
     clear_association_cache
     save!
     clear_aggregation_cache
     clear_association_cache

-    @attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
+    @attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp], :order => "version desc").instance_variable_get('@attributes'))

 
     # ok, you can touch from here on
 
 
     # ok, you can touch from here on
 


@@ -34,14 +38,12 @@ class OldRelation < ActiveRecord::Base
       tag.save!
     end
 
       tag.save!
     end
 

-    i = 1
-    self.members.each do |m|
+    self.members.each_with_index do |m,i|

       member = OldRelationMember.new
       member = OldRelationMember.new

-      member.id = self.id
-      member.member_type = m[0]
+      member.id = [self.id, self.version, i]
+      member.member_type = m[0].classify

       member.member_id = m[1]
       member.member_role = m[2]
       member.member_id = m[1]
       member.member_role = m[2]

-      member.version = self.version

       member.save!
     end
   end
       member.save!
     end
   end


@@ -49,7 +51,7 @@ class OldRelation < ActiveRecord::Base
   def members
     unless @members
         @members = Array.new
   def members
     unless @members
         @members = Array.new

-        OldRelationMember.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |m|
+        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
     end
             @members += [[m.type,m.id,m.role]]
         end
     end


@@ -79,25 +81,34 @@ class OldRelation < ActiveRecord::Base
 #  has_many :relation_tags, :class_name => 'OldRelationTag', :foreign_key => 'id'
 
   def old_members
 #  has_many :relation_tags, :class_name => 'OldRelationTag', :foreign_key => 'id'
 
   def old_members

-    OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
+    OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version], :order => "sequence_id")

   end
 
   def old_tags
     OldRelationTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
   end
 
   end
 
   def old_tags
     OldRelationTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
   end
 

+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return 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
   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

-    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?
+    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'
     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['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
       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