X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8a69ef115a01f2f6f2ba41d131147b19450a19f5..e823ce2fc4b9909986987db6b1fc41eaff8c3499:/app/models/old_way.rb

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index aa9c81d0a..136e64793 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -9,6 +9,7 @@ class OldWay < ActiveRecord::Base
     old_way.user_id = way.user_id
     old_way.timestamp = way.timestamp
     old_way.id = way.id
+    old_way.version = way.version
     old_way.nds = way.nds
     old_way.tags = way.tags
     return old_way
@@ -38,15 +39,13 @@ class OldWay < ActiveRecord::Base
       tag.save!
     end
 
-    i = 1
+    sequence = 1
     self.nds.each do |n|
       nd = OldWayNode.new
-      nd.id = self.id
+      nd.id = [self.id, self.version, sequence]
       nd.node_id = n
-      nd.sequence_id = i
-      nd.version = self.version
       nd.save!
-      i += 1
+      sequence += 1
     end
   end
 
@@ -96,6 +95,7 @@ class OldWay < ActiveRecord::Base
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['user'] = self.user.display_name if self.user.data_public?
+    el1['version'] = self.version.to_s
     
     self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'nd'