Altered old_way stuff to be Railsy like old_node is now

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 5643a389bc8ad69fb83f7f886b122e97f4cbe8ff..9e2c5a40ef3830cbcd50b10ab1d81bf7ed2e4923 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,11 +1,14 @@
 class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
-  include Redactable
 
   self.table_name = "nodes"
   self.primary_keys = "node_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
+
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
@@ -42,24 +45,31 @@ class OldNode < ActiveRecord::Base
   def to_xml_node
     el1 = XML::Node.new 'node'
     el1['id'] = self.node_id.to_s
-    el1['lat'] = self.lat.to_s
-    el1['lon'] = self.lon.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['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
     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['version'] = self.version.to_s
+    if self.redacted?
+      el1['redacted'] = self.redaction.title
+    end
     return el1
   end