Merge remote-tracking branch 'upstream/pull/2915' into master

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index bc114d73a512dd49fcad30aebabf02bdb8141974..991925102c4fa9813ca4bccdae1e2f2a7f180df2 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,5 +1,28 @@
-class OldWay < ActiveRecord::Base
+# == Schema Information
+#
+# Table name: ways
+#
+#  way_id       :bigint(8)        default(0), not null, primary key
+#  changeset_id :bigint(8)        not null
+#  timestamp    :datetime         not null
+#  version      :bigint(8)        not null, primary key
+#  visible      :boolean          default(TRUE), not null
+#  redaction_id :integer
+#
+# Indexes
+#
+#  ways_changeset_id_idx  (changeset_id)
+#  ways_timestamp_idx     (timestamp)
+#
+# Foreign Keys
+#
+#  ways_changeset_id_fkey  (changeset_id => changesets.id)
+#  ways_redaction_id_fkey  (redaction_id => redactions.id)
+#
+
+class OldWay < ApplicationRecord

   include ConsistencyValidations
   include ConsistencyValidations

+  include ObjectMetadata

 
   self.table_name = "ways"
   self.primary_keys = "way_id", "version"
 
   self.table_name = "ways"
   self.primary_keys = "way_id", "version"


@@ -12,11 +35,13 @@ class OldWay < ActiveRecord::Base
   belongs_to :redaction
   belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id"
 
   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]
+  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 :changeset, :presence => true, :associated => true
+  validates :timestamp, :presence => true
+  validates :visible, :inclusion => [true, false]

 
 

-  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


@@ -26,37 +51,25 @@ class OldWay < ActiveRecord::Base
     old_way.version = way.version
     old_way.nds = way.nds
     old_way.tags = way.tags
     old_way.version = way.version
     old_way.nds = way.nds
     old_way.tags = way.tags

-    return old_way
+    old_way

   end
 
   def save_with_dependencies!
   end
 
   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
-    # it doesn't have a unique key. It knows how to insert and auto_increment
-    # 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
-    @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

 
 

-    self.tags.each do |k,v|
+    tags.each do |k, v|

       tag = OldWayTag.new
       tag.k = k
       tag.v = v
       tag = OldWayTag.new
       tag.k = k
       tag.v = v

-      tag.way_id = self.way_id
-      tag.version = self.version
+      tag.way_id = way_id
+      tag.version = version

       tag.save!
     end
 
     sequence = 1
       tag.save!
     end
 
     sequence = 1

-    self.nds.each do |n|
+    nds.each do |n|

       nd = OldWayNode.new
       nd = OldWayNode.new

-      nd.id = [self.way_id, self.version, sequence]
+      nd.id = [way_id, version, sequence]

       nd.node_id = n
       nd.save!
       sequence += 1
       nd.node_id = n
       nd.save!
       sequence += 1


@@ -64,113 +77,76 @@ class OldWay < ActiveRecord::Base
   end
 
   def nds
   end
 
   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
+    @nds ||= old_nodes.order(:sequence_id).collect(&:node_id)

   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
+    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]

   end
 
   end
 

-  def nds=(s)
-    @nds = s
-  end
+  attr_writer :nds, :tags

 
 

-  def tags=(t)
-    @tags = t
-  end
+  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
+    el = XML::Node.new "way"
+    el["id"] = way_id.to_s

 
 

-  def to_xml_node
-    el1 = XML::Node.new 'way'
-    el1['id'] = self.way_id.to_s
-    el1['visible'] = self.visible.to_s
-    el1['timestamp'] = self.timestamp.xmlschema
-    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_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
-      
-    self.old_tags.each do |tag|
-      e = XML::Node.new 'tag'
-      e['k'] = tag.k
-      e['v'] = tag.v
-      el1 << e
+    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
+
+    old_nodes.each do |nd| # FIXME: need to make sure they come back in the right order
+      node_el = XML::Node.new "nd"
+      node_el["ref"] = nd.node_id.to_s
+      el << node_el

     end
 
     end
 

-    return el1
+    add_tags_to_xml_node(el, old_tags)
+
+    el

   end
 
   # Read full version of old way
   # For get_nodes_undelete, uses same nodes, even if they've moved since
   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 
+  # 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
   # 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|
+    nds.collect do |n|

       node = Node.find(n)
       node = Node.find(n)

-      points << [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
+      [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]

     end
     end

-    points

   end
   end

-  
+

   def get_nodes_revert(timestamp)
   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
+    points = []
+    nds.each do |n|
+      oldnode = OldNode.where("node_id = ? AND timestamp <= ?", n, timestamp).unredacted.order("timestamp DESC").first

       curnode = Node.find(n)
       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
+      id = n
+      reuse = curnode.visible
+      # if node has changed and it's in other ways, give it a new id
+      if !curnode.ways.all?(way_id) && (oldnode.lat != curnode.lat || oldnode.lon != curnode.lon || oldnode.tags != curnode.tags)
+        id = -1
+        reuse = false

       end
       points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse]
     end
     points
   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
   # Temporary method to match interface to ways
   def way_nodes

-    return self.old_nodes
+    old_nodes

   end
 
   # Pretend we're not in any relations
   def containing_relation_members
   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?
   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
+    current_way.version == version

   end
 end
   end
 end