When a new user confirms their email address, log them automatically and

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 230b0f9a779582ff2c4ebf68dd73144434abd63d..6eecc853d12a585577a95e36c3a1e87331bf5fd4 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -61,6 +61,7 @@ class Node < ActiveRecord::Base
   def save_with_history
     begin
       Node.transaction do
   def save_with_history
     begin
       Node.transaction do

+        self.timestamp = Time.now

         self.save
         old_node = OldNode.from_node(self)
         old_node.save
         self.save
         old_node = OldNode.from_node(self)
         old_node.save


@@ -72,22 +73,27 @@ class Node < ActiveRecord::Base
   end
 
   def to_xml
   end
 
   def to_xml

-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = API_VERSION
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
-    root << to_xml_node()
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()

     return doc
   end
 
     return doc
   end
 

-  def to_xml_node
+  def to_xml_node(user_display_name_cache = nil)

     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s

-    el1['user'] = self.user.display_name if self.user.data_public?
+
+    # el['user'] = self.user.display_name if self.user.data_public?
+    user_display_name_cache = {} if user_display_name_cache.nil?
+    if user_display_name_cache and user_display_name_cache[self.user_id]
+      # use the cache if available
+    else
+      user_display_name_cache[self.user_id] = self.user.display_name
+    end
+
+    el1['user'] = user_display_name_cache[self.user_id]
+

     Node.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     Node.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema