Fixing a bug in my foreign keys. I can now upload and download nodes and ways using...

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index a2b165e42716f5cfa7f095aa76654616274f95b5..f297cfc1ac01ac3800436817dd59c614a011aaf5 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,14 +1,15 @@
 class OldWay < ActiveRecord::Base
   set_table_name 'ways'
 
 class OldWay < ActiveRecord::Base
   set_table_name 'ways'
 

-  belongs_to :user
+  belongs_to :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.timestamp = way.timestamp
     old_way.id = way.id

+    old_way.version = way.version

     old_way.nds = way.nds
     old_way.tags = way.tags
     return old_way
     old_way.nds = way.nds
     old_way.tags = way.tags
     return old_way


@@ -94,6 +95,7 @@ class OldWay < ActiveRecord::Base
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['user'] = self.user.display_name if self.user.data_public?
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['user'] = self.user.display_name if self.user.data_public?

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


@@ -108,5 +110,49 @@ 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
+  
+  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]
+    end
+       points
+  end
+  
+  def get_nodes_revert
+    points=[]
+    self.nds.each do |n|
+      oldnode=OldNode.find(:first, :conditions=>['id=? AND timestamp<=?',n,self.timestamp], :order=>"timestamp DESC")
+      curnode=Node.find(n)
+      id=n; v=curnode.visible ? 1 : 0
+      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
+      end
+      points << [oldnode.lon, oldnode.lat, id, v, oldnode.tags_as_hash]
+    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