X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/15b104f4ff4614aa78c01180b6a9b89dd5a1400f..255ce8708a4e9099f9a9eaa92278a40629a4d883:/app/models/old_way.rb?ds=sidebyside diff --git a/app/models/old_way.rb b/app/models/old_way.rb index baca05d33..247123005 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -2,10 +2,10 @@ # # Table name: ways # -# way_id :integer default(0), not null, primary key -# changeset_id :integer not null +# way_id :bigint(8) default(0), not null, primary key +# changeset_id :bigint(8) not null # timestamp :datetime not null -# version :integer not null, primary key +# version :bigint(8) not null, primary key # visible :boolean default(TRUE), not null # redaction_id :integer # @@ -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 @@ -84,9 +84,7 @@ class OldWay < ActiveRecord::Base @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }] 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