Refactor generation of object metadata in API calls

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index bc114d73a512dd49fcad30aebabf02bdb8141974..8b9bf19e64bb5b54b9f28bcb8f0520060bd57818 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,5 +1,6 @@
 class OldWay < ActiveRecord::Base
   include ConsistencyValidations
 class OldWay < ActiveRecord::Base
   include ConsistencyValidations

+  include ObjectMetadata

 
   self.table_name = "ways"
   self.primary_keys = "way_id", "version"
 
   self.table_name = "ways"
   self.primary_keys = "way_id", "version"


@@ -92,20 +93,11 @@ class OldWay < ActiveRecord::Base
     @tags = t
   end
 
     @tags = t
   end
 

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

     el1 = XML::Node.new 'way'
     el1['id'] = self.way_id.to_s
     el1 = XML::Node.new 'way'
     el1['id'] = self.way_id.to_s

-    el1['visible'] = self.visible.to_s
-    el1['timestamp'] = self.timestamp.xmlschema
-    if self.changeset.user.data_public?
-      el1['user'] = self.changeset.user.display_name
-      el1['uid'] = self.changeset.user.id.to_s
-    end
-    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)

 
 

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

     self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'nd'
       e['ref'] = nd.node_id.to_s
     self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'nd'
       e['ref'] = nd.node_id.to_s