Make more use of named scopes

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 136e647938122d69a83ed5669521dbe4e64f54ec..85cc6444766e25affdd3796c23bec7ef049e4c39 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,12 +1,16 @@
 class OldWay < ActiveRecord::Base
 class OldWay < ActiveRecord::Base

+  include ConsistencyValidations
+  

   set_table_name 'ways'
 
   set_table_name 'ways'
 

-  belongs_to :user
+  belongs_to :changeset

 
 

+  validates_associated :changeset
+  

   def self.from_way(way)
     old_way = OldWay.new
     old_way.visible = way.visible
   def self.from_way(way)
     old_way = OldWay.new
     old_way.visible = way.visible

-    old_way.user_id = way.user_id
+    old_way.changeset_id = way.changeset_id

     old_way.timestamp = way.timestamp
     old_way.id = way.id
     old_way.version = way.version
     old_way.timestamp = way.timestamp
     old_way.id = way.id
     old_way.version = way.version


@@ -26,7 +30,7 @@ class OldWay < ActiveRecord::Base
     save!
     clear_aggregation_cache
     clear_association_cache
     save!
     clear_aggregation_cache
     clear_association_cache

-    @attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
+    @attributes.update(OldWay.where('id = ? AND timestamp = ?', self.id, self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))

 
     # ok, you can touch from here on
 
 
     # ok, you can touch from here on
 


@@ -52,7 +56,7 @@ class OldWay < ActiveRecord::Base
   def nds
     unless @nds
         @nds = Array.new
   def nds
     unless @nds
         @nds = Array.new

-        OldWayNode.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version], :order => "sequence_id").each do |nd|
+        OldWayNode.where("id = ? AND version = ?", self.id, self.version).order(:sequence_id).each do |nd|

             @nds += [nd.node_id]
         end
     end
             @nds += [nd.node_id]
         end
     end


@@ -62,7 +66,7 @@ class OldWay < ActiveRecord::Base
   def tags
     unless @tags
         @tags = Hash.new
   def tags
     unless @tags
         @tags = Hash.new

-        OldWayTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
+        OldWayTag.where("id = ? AND version = ?", self.id, self.version).each do |tag|

             @tags[tag.k] = tag.v
         end
     end
             @tags[tag.k] = tag.v
         end
     end


@@ -82,11 +86,11 @@ class OldWay < ActiveRecord::Base
 #  has_many :way_tags, :class_name => 'OldWayTag', :foreign_key => 'id'
 
   def old_nodes
 #  has_many :way_tags, :class_name => 'OldWayTag', :foreign_key => 'id'
 
   def old_nodes

-    OldWayNode.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
+    OldWayNode.where('id = ? AND version = ?', self.id, self.version)

   end
 
   def old_tags
   end
 
   def old_tags

-    OldWayTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
+    OldWayTag.where('id = ? AND version = ?', self.id, self.version)

   end
 
   def to_xml_node
   end
 
   def to_xml_node


@@ -94,8 +98,12 @@ class OldWay < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema

-    el1['user'] = self.user.display_name if self.user.data_public?
+    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['version'] = self.version.to_s

+    el1['changeset'] = self.changeset.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'
     
     self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'nd'


@@ -110,5 +118,51 @@ class OldWay < ActiveRecord::Base
       el1 << e
     end
     return el1
       el1 << e
     end
     return el1

-  end 
+  end
+
+  # Read full version of old way
+  # For get_nodes_undelete, uses same nodes, even if they've moved since
+  # For get_nodes_revert,   allocates new ids 
+  # Currently returns Potlatch-style array
+  # where [5] indicates whether latest version is usable as is (boolean)
+  # (i.e. is it visible? are we actually reverting to an earlier version?)
+
+  def get_nodes_undelete
+    points = []
+    self.nds.each do |n|
+      node = Node.find(n)
+      points << [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
+    end
+    points
+  end
+  
+  def get_nodes_revert(timestamp)
+    points=[]
+    self.nds.each do |n|
+      oldnode = OldNode.where('id = ? AND timestamp <= ?', n, timestamp).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
+        # node has changed: if it's in other ways, give it a new id
+        if curnode.ways-[self.id] then id=-1; reuse=false end
+      end
+      points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse]
+    end
+    points
+  end
+
+  # Temporary method to match interface to nodes
+  def tags_as_hash
+    return self.tags
+  end
+
+  # Temporary method to match interface to ways
+  def way_nodes
+    return self.old_nodes
+  end
+
+  # Pretend we're not in any relations
+  def containing_relation_members
+    return []
+  end

 end
 end