Move base layer UI above overlay layer UI

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 3ded52382164d4eabffb7489fc4219c5a89ea763..ab25d4dbc588d48f5faa38f7553744add56c927c 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -42,34 +42,50 @@ class OldNode < ActiveRecord::Base
     return doc
   end
 
     return doc
   end
 

-  def to_xml_node
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})

     el1 = XML::Node.new 'node'
     el1['id'] = self.node_id.to_s
     el1 = XML::Node.new 'node'
     el1['id'] = self.node_id.to_s

-    unless self.redacted? and (@user.nil? or not @user.moderator?)
-      self.tags.each do |k,v|
-        el2 = XML::Node.new('tag')
-        el2['k'] = k.to_s
-        el2['v'] = v.to_s
-        el1 << el2
-      end
+    el1['version'] = self.version.to_s
+    el1['changeset'] = self.changeset_id.to_s
+
+    if self.visible?

       el1['lat'] = self.lat.to_s
       el1['lon'] = self.lon.to_s
     end
       el1['lat'] = self.lat.to_s
       el1['lon'] = self.lon.to_s
     end

-    
-    el1['changeset'] = self.changeset.id.to_s
-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
+
+    if changeset_cache.key?(self.changeset_id)
+      # use the cache if available
+    else
+      changeset_cache[self.changeset_id] = self.changeset.user_id

     end
 
     end
 

-    
+    user_id = changeset_cache[self.changeset_id]
+
+    if user_display_name_cache.key?(user_id)
+      # use the cache if available
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[user_id] = self.changeset.user.display_name
+    else
+      user_display_name_cache[user_id] = nil
+    end
+
+    if not user_display_name_cache[user_id].nil?
+      el1['user'] = user_display_name_cache[user_id]
+      el1['uid'] = user_id.to_s
+    end
+
+    self.tags.each do |k,v|
+      el2 = XML::Node.new('tag')
+      el2['k'] = k.to_s
+      el2['v'] = v.to_s
+      el1 << el2
+    end

 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
 
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    el1['version'] = self.version.to_s
-    if self.redacted?
-      el1['redacted'] = self.redaction.id.to_s
-    end
+    
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?
+

     return el1
   end
 
     return el1
   end