Refactor note add/update code

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 4a5362bc161d486f4be84d4b7f2ef5432009dfb8..bc114d73a512dd49fcad30aebabf02bdb8141974 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,19 +1,35 @@
 class OldWay < ActiveRecord::Base
 class OldWay < ActiveRecord::Base

-  set_table_name 'ways'
+  include ConsistencyValidations

 
 

-  belongs_to :user
+  self.table_name = "ways"
+  self.primary_keys = "way_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
+
+  belongs_to :changeset
+  belongs_to :redaction
+  belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
+
+  has_many :old_nodes, :class_name => 'OldWayNode', :foreign_key => [:way_id, :version]
+  has_many :old_tags, :class_name => 'OldWayTag', :foreign_key => [:way_id, :version]
+
+  validates_associated :changeset
+  

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

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

     old_way.timestamp = way.timestamp
     old_way.timestamp = way.timestamp

-    old_way.id = way.id
-    old_way.segs = way.segs
+    old_way.way_id = way.id
+    old_way.version = way.version
+    old_way.nds = way.nds

     old_way.tags = way.tags
     return old_way
   end
 
     old_way.tags = way.tags
     return old_way
   end
 

-  def save_with_dependencies
+  def save_with_dependencies!

 
     # dont touch this unless you really have figured out why it's called
     # (Rails doesn't deal well with the old ways table (called 'ways') because
 
     # dont touch this unless you really have figured out why it's called
     # (Rails doesn't deal well with the old ways table (called 'ways') because


@@ -21,10 +37,10 @@ class OldWay < ActiveRecord::Base
     # id and get it back but we have that and we want to get the 'version' back
     # we could add another column but thats a lot of data. No, set_primary_key
     # doesn't work either.
     # id and get it back but we have that and we want to get the 'version' back
     # we could add another column but thats a lot of data. No, set_primary_key
     # doesn't work either.

-    save()
+    save!

     clear_aggregation_cache
     clear_association_cache
     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(:way_id => self.way_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))

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


@@ -32,69 +48,129 @@ class OldWay < ActiveRecord::Base
       tag = OldWayTag.new
       tag.k = k
       tag.v = v
       tag = OldWayTag.new
       tag.k = k
       tag.v = v

-      tag.id = self.id
+      tag.way_id = self.way_id

       tag.version = self.version
       tag.version = self.version

-      tag.save
+      tag.save!

     end
 
     end
 

-    i = 0
-    self.segs.each do |n|
-      seg = OldWaySegment.new
-      seg.id = self.id
-      seg.segment_id = n
-      seg.version = self.version
-      seg.save
+    sequence = 1
+    self.nds.each do |n|
+      nd = OldWayNode.new
+      nd.id = [self.way_id, self.version, sequence]
+      nd.node_id = n
+      nd.save!
+      sequence += 1

     end
   end
 
     end
   end
 

-  def segs
-    @segs = Array.new unless @segs
-    @segs
+  def nds
+    unless @nds
+      @nds = Array.new
+      OldWayNode.where(:way_id => self.way_id, :version => self.version).order(:sequence_id).each do |nd|
+        @nds += [nd.node_id]
+      end
+    end
+    @nds

   end
 
   def tags
   end
 
   def tags

+    unless @tags
+      @tags = Hash.new
+      OldWayTag.where(:way_id => self.way_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
   end
 

-  def segs=(s)
-    @segs = s
+  def nds=(s)
+    @nds = s

   end
 
   def tags=(t)
     @tags = t
   end
 
   end
 
   def tags=(t)
     @tags = t
   end
 

-#  has_many :way_segments, :class_name => 'OldWaySegment', :foreign_key => 'id'
-#  has_many :way_tags, :class_name => 'OldWayTag', :foreign_key => 'id'
-
-  def old_segments
-    OldWaySegment.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
-  end
-
-  def old_tags
-    OldWayTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
-  end
-

   def to_xml_node
     el1 = XML::Node.new 'way'
   def to_xml_node
     el1 = XML::Node.new 'way'

-    el1['id'] = self.id.to_s
+    el1['id'] = self.way_id.to_s

     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     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['changeset'] = self.changeset.id.to_s
+
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?

     
     

-    self.old_segments.each do |seg| # FIXME need to make sure they come back in the right order
-      e = XML::Node.new 'seg'
-      e['id'] = seg.segment_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'
+      e['ref'] = nd.node_id.to_s

       el1 << e
     end
       el1 << e
     end

- 
+      

     self.old_tags.each do |tag|
       e = XML::Node.new 'tag'
       e['k'] = tag.k
       e['v'] = tag.v
       el1 << e
     end
     self.old_tags.each do |tag|
       e = XML::Node.new 'tag'
       e['k'] = tag.k
       e['v'] = tag.v
       el1 << e
     end

+

     return el1
     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('node_id = ? AND timestamp <= ?', n, timestamp).unredacted.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.way_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
+
+  # check whether this element is the latest version - that is,
+  # has the same version as its "current" counterpart.
+  def is_latest_version?
+    current_way.version == self.version
+  end

 end
 end