Migration to add close-time to changesets. This replaces the boolean 'open' attribute...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index cf7aedae88c77692519022e11804678383a0bf6c..e926e06a210baa326842920a2c113f39085aee05 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -141,6 +141,9 @@ class Node < ActiveRecord::Base
       old_node.timestamp = t
       old_node.save_with_dependencies!
 
+      # tell the changeset we updated one element only
+      changeset.add_changes! 1
+
       # save the changeset in case of bounding box updates
       changeset.save!
     end
@@ -222,7 +225,10 @@ class Node < ActiveRecord::Base
       user_display_name_cache[self.changeset.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
+    if not user_display_name_cache[self.changeset.user_id].nil?
+      el1['user'] = user_display_name_cache[self.changeset.user_id]
+      el1['uid'] = self.changeset.user_id.to_s
+    end
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
@@ -264,6 +270,13 @@ class Node < ActiveRecord::Base
     @tags[k] = v
   end
 
+  ##
+  # are the preconditions OK? this is mainly here to keep the duck
+  # typing interface the same between nodes, ways and relations.
+  def preconditions_ok?
+    in_world?
+  end
+
   ##
   # dummy method to make the interfaces of node, way and relation
   # more consistent.