Update imagery definitions for Potlatch 2

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index ca179e0e9189d8a86dcefd97d61841c1d1f7349b..c2ec43c9c0431d40357c80803486d71ed87a1799 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -2,12 +2,13 @@ class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
 
   include GeoRecord
   include ConsistencyValidations
 

-  set_table_name 'nodes'
-  
-  # Should probably have the composite primary key set in the model
-  # however there are some weird bugs happening when you do
-  #set_primary_keys :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 ]
   validates_numericality_of :latitude, :longitude
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude


@@ -15,7 +16,9 @@ class OldNode < ActiveRecord::Base
   validates_associated :changeset
 
   belongs_to :changeset
   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
   def validate_position
     errors.add(:base, "Node is not in the world") unless in_world?
   end


@@ -28,7 +31,7 @@ class OldNode < ActiveRecord::Base
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp
     old_node.changeset_id = node.changeset_id
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp
     old_node.changeset_id = node.changeset_id

-    old_node.id = node.id
+    old_node.node_id = node.id

     old_node.version = node.version
     return old_node
   end
     old_node.version = node.version
     return old_node
   end


@@ -41,14 +44,7 @@ class OldNode < ActiveRecord::Base
 
   def to_xml_node
     el1 = XML::Node.new 'node'
 
   def to_xml_node
     el1 = XML::Node.new 'node'

-    el1['id'] = self.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
+    el1['id'] = self.node_id.to_s

 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')


@@ -57,9 +53,23 @@ class OldNode < ActiveRecord::Base
       el1 << el2
     end
 
       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['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
 
     return el1
   end
 


@@ -69,13 +79,13 @@ class OldNode < ActiveRecord::Base
     clear_aggregation_cache
     clear_association_cache
     #ok from here
     clear_aggregation_cache
     clear_association_cache
     #ok from here

-    @attributes.update(OldNode.where('id = ? AND timestamp = ? AND version = ?', self.id, self.timestamp, self.version).first.instance_variable_get('@attributes'))
+    @attributes.update(OldNode.where(:node_id => self.node_id, :timestamp => self.timestamp, :version => self.version).first.instance_variable_get('@attributes'))

    
     self.tags.each do |k,v|
       tag = OldNodeTag.new
       tag.k = k
       tag.v = v
    
     self.tags.each do |k,v|
       tag = OldNodeTag.new
       tag.k = k
       tag.v = v

-      tag.id = self.id
+      tag.node_id = self.node_id

       tag.version = self.version
       tag.save!
     end
       tag.version = self.version
       tag.save!
     end


@@ -83,10 +93,10 @@ class OldNode < ActiveRecord::Base
 
   def tags
     unless @tags
 
   def tags
     unless @tags

-        @tags = Hash.new
-        OldNodeTag.where("id = ? AND version = ?", self.id, self.version).each do |tag|
-            @tags[tag.k] = tag.v
-        end
+      @tags = Hash.new
+      OldNodeTag.where(:node_id => self.node_id, :version => self.version).each do |tag|
+        @tags[tag.k] = tag.v
+      end

     end
     @tags = Hash.new unless @tags
     @tags
     end
     @tags = Hash.new unless @tags
     @tags


@@ -109,4 +119,10 @@ class OldNode < ActiveRecord::Base
   def containing_relation_members 
     return [] 
   end 
   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
 end