X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cd2ca12d4235473cd3611b84e2a61649c17da2f6..25e1145c32c34318edab7a5ce0a059034703ccb0:/app/models/old_way.rb

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index dbdcdd46d..8577330c5 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,23 +1,43 @@
-class OldWay < ActiveRecord::Base
-  include ConsistencyValidations
-  include ObjectMetadata
-
+# == Schema Information
+#
+# Table name: ways
+#
+#  way_id       :bigint(8)        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
   self.table_name = "ways"
-  self.primary_keys = "way_id", "version"
 
-  # note this needs to be included after the table name changes, or
+  # 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"
+  belongs_to :redaction, :optional => true
+  belongs_to :current_way, :class_name => "Way", :foreign_key => "way_id", :inverse_of => :old_ways
+
+  has_many :old_nodes, :class_name => "OldWayNode", :query_constraints => [:way_id, :version], :inverse_of => :old_way
+  has_many :old_tags, :class_name => "OldWayTag", :query_constraints => [:way_id, :version], :inverse_of => :old_way
 
-  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, :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
@@ -27,25 +47,25 @@ class OldWay < ActiveRecord::Base
     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!
     save!
 
-    self.tags.each do |k,v|
+    tags.each do |k, 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
-    self.nds.each do |n|
+    nds.each do |n|
       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
@@ -53,85 +73,28 @@ class OldWay < ActiveRecord::Base
   end
 
   def nds
-    @nds ||= self.old_nodes.order(:sequence_id).collect { |n| n.node_id }
+    @nds ||= old_nodes.order(:sequence_id).collect(&:node_id)
   end
 
   def tags
-    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
-  end
-
-  def nds=(s)
-    @nds = s
-  end
-
-  def tags=(t)
-    @tags = t
+    @tags ||= old_tags.to_h { |t| [t.k, t.v] }
   end
 
-  def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
-    el = XML::Node.new 'way'
-    el['id'] = self.way_id.to_s
-
-    add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
-
-    self.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
-      
-    add_tags_to_xml_node(el, self.old_tags)
-
-    return el
-  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
-    self.nds.collect do |n|
-      node = Node.find(n)
-      [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
-    end
-  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
+  attr_writer :nds, :tags
 
   # 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
-    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
+  def latest_version?
+    current_way.version == version
   end
 end