Fix OldRelation.tags

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 474c3e02be862d47890d16c11f46591e2ec9b15a..408dd72c7e93dab73f0618c2b6849ad1721b5329 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,10 +1,14 @@
 class OldWay < ActiveRecord::Base
   include ConsistencyValidations
-  include Redactable
+  include ObjectMetadata
 
   self.table_name = "ways"
   self.primary_keys = "way_id", "version"
 
+  # note this needs to be included after the table name changes, or
+  # the queries generated by Redactable will use the wrong table name.
+  include Redactable
+
   belongs_to :changeset
   belongs_to :redaction
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
@@ -63,7 +67,7 @@ class OldWay < ActiveRecord::Base
   def nds
     unless @nds
       @nds = Array.new
-      OldWayNode.where(:way_id => self.way_id, :version => self.version).order(:sequence_id).each do |nd|
+      self.old_nodes.order(:sequence_id).each do |nd|
         @nds += [nd.node_id]
       end
     end
@@ -73,7 +77,7 @@ class OldWay < ActiveRecord::Base
   def tags
     unless @tags
       @tags = Hash.new
-      OldWayTag.where(:way_id => self.way_id, :version => self.version).each do |tag|
+      self.old_tags.each do |tag|
         @tags[tag.k] = tag.v
       end
     end
@@ -89,39 +93,21 @@ class OldWay < ActiveRecord::Base
     @tags = t
   end
 
-  def to_xml_node
-    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
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
+    el = XML::Node.new 'way'
+    el['id'] = self.way_id.to_s
+
+    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
-    if self.redacted?
-      el1['redacted'] = self.redaction.title
+    self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
+      node_el = XML::Node.new 'nd'
+      node_el['ref'] = nd.node_id.to_s
+      el << node_el
     end
-    
-    unless self.redacted? and (@user.nil? or not @user.moderator?)
-      # If a way is redacted and the user isn't a moderator, only show
-      # meta-data from this revision, but no real data.
-      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
-        el1 << e
-      end
       
-      self.old_tags.each do |tag|
-        e = XML::Node.new 'tag'
-        e['k'] = tag.k
-        e['v'] = tag.v
-        el1 << e
-      end
-    end
-    return el1
+    add_tags_to_xml_node(el, self.old_tags)
+
+    return el
   end
 
   # Read full version of old way
@@ -143,7 +129,7 @@ class OldWay < ActiveRecord::Base
   def get_nodes_revert(timestamp)
     points=[]
     self.nds.each do |n|
-      oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).order("timestamp DESC").first
+      oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).unredacted.order("timestamp DESC").first
       curnode = Node.find(n)
       id = n; reuse = curnode.visible
       if oldnode.lat != curnode.lat or oldnode.lon != curnode.lon or oldnode.tags != curnode.tags then