X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fc25c3d412829774abf0454e4dcc92e41f47454c..1f7dd79daf44de5f8f8b6c246a269e44bb258175:/app/models/old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index f8af91abb..c2ec43c9c 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -2,8 +2,12 @@ class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
 
-  set_table_name 'nodes'
-  set_primary_keys :node_id, :version
+  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 ]
@@ -12,7 +16,9 @@ class OldNode < ActiveRecord::Base
   validates_associated :changeset
 
   belongs_to :changeset
- 
+  belongs_to :redaction
+  belongs_to :current_node, :class_name => "Node", :foreign_key => "node_id"
+
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?
   end
@@ -39,13 +45,6 @@ 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
-    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')
@@ -54,9 +53,23 @@ class OldNode < ActiveRecord::Base
       el1 << el2
     end
 
+    if self.visible?
+      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
+
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['version'] = self.version.to_s
+    
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?
+
     return el1
   end
 
@@ -106,4 +119,10 @@ class OldNode < ActiveRecord::Base
   def containing_relation_members 
     return [] 
   end 
+
+  # check whether this element is the latest version - that is,
+  # has the same version as its "current" counterpart.
+  def is_latest_version?
+    current_node.version == self.version
+  end
 end