X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c2af89c00e5bcb20981e737abb779ef65acd7b3e..d5fe598a18eb04b10f4ac29f22a1bccb79185ad4:/app/models/old_way.rb?ds=sidebyside diff --git a/app/models/old_way.rb b/app/models/old_way.rb index 991925102..247123005 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -27,7 +27,7 @@ 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 @@ -103,37 +103,6 @@ class OldWay < ApplicationRecord 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 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 - # Temporary method to match interface to ways def way_nodes old_nodes