Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index df2ab3fa4805664f34ebc7eb3eb4d33f4548a669..dc5715693af0328e5e7d0a8b005dd346528f2eb3 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -30,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.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp], :order => "version desc").instance_variable_get('@attributes'))

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


@@ -124,12 +124,14 @@ class OldWay < ActiveRecord::Base
   # 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
   # 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)
   def get_nodes_undelete
        points = []
        self.nds.each do |n|
          node=Node.find(n)

-         points << [node.lon, node.lat, n, node.visible ? 1 : 0, node.tags_as_hash]
+         points << [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]

     end
        points
   end
     end
        points
   end


@@ -139,12 +141,12 @@ class OldWay < ActiveRecord::Base
     self.nds.each do |n|
       oldnode=OldNode.find(:first, :conditions=>['id=? AND timestamp<=?',n,timestamp], :order=>"timestamp DESC")
       curnode=Node.find(n)
     self.nds.each do |n|
       oldnode=OldNode.find(:first, :conditions=>['id=? AND timestamp<=?',n,timestamp], :order=>"timestamp DESC")
       curnode=Node.find(n)

-      id=n; v=curnode.visible ? 1 : 0
+      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 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; v=nil end
+        if curnode.ways-[self.id] then id=-1; reuse=false end

       end
       end

-      points << [oldnode.lon, oldnode.lat, id, v, oldnode.tags_as_hash]
+      points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse]

     end
     points
   end
     end
     points
   end