X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/1a6230fb25f44491156dd20b07a4bfd8a86cca56..bcbf417796c9da00397237d6e3808859d5d3adca:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 5a8e03ef1..5e5e7a0b2 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -96,35 +96,27 @@ class Node < GeoRecord
 
   def save_with_history!
     t = Time.now
-
-    Node.transaction do 
-      # apply timestamp to the new node
+    Node.transaction do
+      self.version += 1
       self.timestamp = t
       self.save!
-    end
 
-    # Create a NodeTag
-    NodeTag.transaction do 
+      # Create a NodeTag
       tags = self.tags
-
       NodeTag.delete_all(['id = ?', self.id])
-
-      sequence_id = 1
       tags.each do |k,v|
-        tag = NodeTag.new
-        tag.k = k 
-        tag.v = v 
-        tag.id = self.id
-        tag.sequence_id = sequence_id
-        tag.save!
-        sequence_id += 1
+	tag = NodeTag.new
+	tag.k = k 
+	tag.v = v 
+	tag.id = self.id
+	tag.save!
       end 
-    end 
-    # Create an OldNode
-    old_node = OldNode.from_node(self)
-    old_node.timestamp = t
-    old_node.save_with_dependencies!
 
+      # Create an OldNode
+      old_node = OldNode.from_node(self)
+      old_node.timestamp = t
+      old_node.save_with_dependencies!
+    end
   end
 
   def to_xml
@@ -160,6 +152,7 @@ class Node < GeoRecord
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
+    el1['version'] = self.version.to_s
     return el1
   end