X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f1c6a87aa137c11d0aff5a4b0e563ac2c2a8f82d..387d130e87b79cb428f7554c1a233de5d0627ae9:/app/models/old_way.rb diff --git a/app/models/old_way.rb b/app/models/old_way.rb index b515322e3..fcff84ede 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -22,23 +22,22 @@ 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 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", :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], :inverse_of => :old_way + has_many :old_tags, :class_name => "OldWayTag", :foreign_key => [:way_id, :version], :inverse_of => :old_way - validates :changeset, :presence => true, :associated => true + validates :changeset, :associated => true validates :timestamp, :presence => true validates :visible, :inclusion => [true, false] @@ -81,62 +80,10 @@ class OldWay < ApplicationRecord end def tags - @tags ||= Hash[old_tags.collect { |t| [t.k, t.v] }] + @tags ||= old_tags.to_h { |t| [t.k, t.v] } end - attr_writer :nds - - attr_writer :tags - - def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) - el = XML::Node.new "way" - el["id"] = way_id.to_s - - 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 - - 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 - # 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 + attr_writer :nds, :tags # Temporary method to match interface to ways def way_nodes @@ -150,7 +97,7 @@ class OldWay < ApplicationRecord # check whether this element is the latest version - that is, # has the same version as its "current" counterpart. - def is_latest_version? + def latest_version? current_way.version == version end end