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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index e2a650511..ca43b5912 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -25,7 +25,7 @@ class OldRelation < ActiveRecord::Base
     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
 
@@ -41,7 +41,7 @@ class OldRelation < ActiveRecord::Base
     self.members.each_with_index do |m,i|
       member = OldRelationMember.new
       member.id = [self.id, self.version, i]
-      member.member_type = m[0]
+      member.member_type = m[0].classify
       member.member_id = m[1]
       member.member_role = m[2]
       member.save!
@@ -81,7 +81,7 @@ class OldRelation < ActiveRecord::Base
 #  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
@@ -108,7 +108,7 @@ class OldRelation < ActiveRecord::Base
     
     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