Refactor generation of object metadata in API calls

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

diff --git a/app/models/node.rb b/app/models/node.rb
index e81f798b9bc644b2ed6370114c4629672c7a78d0..af2505b9374c4fa8d568b8dd0ce7780541552ac4 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -4,6 +4,7 @@ class Node < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
   include NotRedactable
   include GeoRecord
   include ConsistencyValidations
   include NotRedactable

+  include ObjectMetadata

 
   self.table_name = "current_nodes"
 
 
   self.table_name = "current_nodes"
 


@@ -177,35 +178,13 @@ class Node < ActiveRecord::Base
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s

-    el1['version'] = self.version.to_s
-    el1['changeset'] = self.changeset_id.to_s
+    add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache)

 
     if self.visible?
       el1['lat'] = self.lat.to_s
       el1['lon'] = self.lon.to_s
     end
 
 
     if self.visible?
       el1['lat'] = self.lat.to_s
       el1['lon'] = self.lon.to_s
     end
 

-    if changeset_cache.key?(self.changeset_id)
-      # use the cache if available
-    else
-      changeset_cache[self.changeset_id] = self.changeset.user_id
-    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
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
       el2['k'] = k.to_s


@@ -213,8 +192,6 @@ class Node < ActiveRecord::Base
       el1 << el2
     end
 
       el1 << el2
     end
 

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

     return el1
   end
 
     return el1
   end