X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/21bf5d79d680f7dc0447b1b5980ad5ce0a4b830c..31e247c1e223145a6ac8ce9012fe5eb586f1aaea:/app/models/old_way.rb?ds=inline

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 31e230c38..3260f2a1f 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -20,14 +20,14 @@
 #  ways_redaction_id_fkey  (redaction_id => redactions.id)
 #
 
-class OldWay < ActiveRecord::Base
+class OldWay < ApplicationRecord
   include ConsistencyValidations
   include ObjectMetadata
 
   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
 
@@ -81,12 +81,10 @@ class OldWay < ActiveRecord::Base
   end
 
   def tags
-    @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }]
+    @tags ||= old_tags.collect { |t| [t.k, t.v] }.to_h
   end
 
-  attr_writer :nds
-
-  attr_writer :tags
+  attr_writer :nds, :tags
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
     el = XML::Node.new "way"
@@ -105,39 +103,6 @@ class OldWay < ActiveRecord::Base
     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
-    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 = []
-    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 || oldnode.lon != curnode.lon || oldnode.tags != curnode.tags
-        # node has changed: if it's in other ways, give it a new id
-        if curnode.ways - [way_id]
-          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 ways
   def way_nodes
     old_nodes