X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/40414cf324309d13d207f9339b7f40ce05a9fa2a..8c029f8d79d07384cffafb82d4b5979181bda8ad:/app/models/old_way.rb diff --git a/app/models/old_way.rb b/app/models/old_way.rb index 2820d9438..e5ba53852 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -1,14 +1,29 @@ class OldWay < ActiveRecord::Base - set_table_name 'ways' + 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 + # 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" + + 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_associated :changeset + def self.from_way(way) old_way = OldWay.new old_way.visible = way.visible - old_way.user_id = way.user_id + old_way.changeset_id = way.changeset_id old_way.timestamp = way.timestamp - old_way.id = way.id + old_way.way_id = way.id old_way.version = way.version old_way.nds = way.nds old_way.tags = way.tags @@ -26,7 +41,7 @@ class OldWay < ActiveRecord::Base save! clear_aggregation_cache clear_association_cache - @attributes.update(OldWay.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes')) + @attributes.update(OldWay.where(:way_id => self.way_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes')) # ok, you can touch from here on @@ -34,7 +49,7 @@ class OldWay < ActiveRecord::Base tag = OldWayTag.new tag.k = k tag.v = v - tag.id = self.id + tag.way_id = self.way_id tag.version = self.version tag.save! end @@ -42,7 +57,7 @@ class OldWay < ActiveRecord::Base sequence = 1 self.nds.each do |n| nd = OldWayNode.new - nd.id = [self.id, self.version, sequence] + nd.id = [self.way_id, self.version, sequence] nd.node_id = n nd.save! sequence += 1 @@ -50,24 +65,11 @@ class OldWay < ActiveRecord::Base end def nds - unless @nds - @nds = Array.new - OldWayNode.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version], :order => "sequence_id").each do |nd| - @nds += [nd.node_id] - end - end - @nds + @nds ||= self.old_nodes.order(:sequence_id).collect { |n| n.node_id } end def tags - unless @tags - @tags = Hash.new - OldWayTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag| - @tags[tag.k] = tag.v - end - end - @tags = Hash.new unless @tags - @tags + @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }] end def nds=(s) @@ -78,65 +80,50 @@ class OldWay < ActiveRecord::Base @tags = t end -# has_many :way_nodes, :class_name => 'OldWayNode', :foreign_key => 'id' -# has_many :way_tags, :class_name => 'OldWayTag', :foreign_key => 'id' - - def old_nodes - OldWayNode.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version]) - end + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) + el = XML::Node.new 'way' + el['id'] = self.way_id.to_s - def old_tags - OldWayTag.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version]) - end + add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache) - def to_xml_node - el1 = XML::Node.new 'way' - el1['id'] = self.id.to_s - el1['visible'] = self.visible.to_s - el1['timestamp'] = self.timestamp.xmlschema - el1['user'] = self.user.display_name if self.user.data_public? - el1['version'] = self.version.to_s - self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order - e = XML::Node.new 'nd' - e['ref'] = nd.node_id.to_s - el1 << e + node_el = XML::Node.new 'nd' + node_el['ref'] = nd.node_id.to_s + el << node_el end - - self.old_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - end - return el1 + + 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 - points = [] - self.nds.each do |n| - node=Node.find(n) - points << [node.lon, node.lat, n, node.visible ? 1 : 0, node.tags_as_hash] + points = [] + self.nds.each do |n| + node = Node.find(n) + points << [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible] end - points + points end - def get_nodes_revert + def get_nodes_revert(timestamp) points=[] self.nds.each do |n| - oldnode=OldNode.find(:first, :conditions=>['id=? AND timestamp<=?',n,self.timestamp], :order=>"timestamp DESC") - curnode=Node.find(n) - id=n; v=curnode.visible ? 1 : 0 - if oldnode.lat!=curnode.lat or oldnode.lon!=curnode.lon or oldnode.tags!=curnode.tags then + 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.id] then id=-1; v=nil end + if curnode.ways-[self.way_id] then id=-1; reuse=false end end - points << [oldnode.lon, oldnode.lat, id, v, oldnode.tags_as_hash] + points << [oldnode.lon, oldnode.lat, id, curnode.version, oldnode.tags_as_hash, reuse] end points end @@ -155,4 +142,10 @@ class OldWay < ActiveRecord::Base 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 + end end