X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9d57643812a8ee94022541c1119a69374565a6dd..e9bea64bf6806be1b0a951fd684fa13314cb8b67:/app/models/old_way.rb diff --git a/app/models/old_way.rb b/app/models/old_way.rb index bb267dffb..425478a5b 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -1,14 +1,19 @@ class OldWay < ActiveRecord::Base + include ConsistencyValidations + set_table_name 'ways' - belongs_to :user + belongs_to :changeset + 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.version = way.version old_way.nds = way.nds old_way.tags = way.tags return old_way @@ -38,15 +43,13 @@ class OldWay < ActiveRecord::Base tag.save! end - i = 1 + sequence = 1 self.nds.each do |n| nd = OldWayNode.new - nd.id = self.id + nd.id = [self.id, self.version, sequence] nd.node_id = n - nd.sequence_id = i - nd.version = self.version nd.save! - i += 1 + sequence += 1 end end @@ -95,11 +98,16 @@ class OldWay < ActiveRecord::Base 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? + if self.changeset.user.data_public? + el1['user'] = self.changeset.user.display_name + el1['uid'] = self.changeset.user.id.to_s + end + el1['version'] = self.version.to_s + el1['changeset'] = self.changeset.id.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['id'] = nd.node_id.to_s + e['ref'] = nd.node_id.to_s el1 << e end @@ -110,5 +118,51 @@ class OldWay < ActiveRecord::Base el1 << e end return el1 - end + 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.version, node.tags_as_hash, node.visible] + end + points + end + + def get_nodes_revert(timestamp) + points=[] + self.nds.each do |n| + oldnode=OldNode.find(:first, :conditions=>['id=? AND timestamp<=?',n,timestamp], :order=>"timestamp DESC") + 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; 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 nodes + def tags_as_hash + return self.tags + end + + # Temporary method to match interface to ways + def way_nodes + return self.old_nodes + end + + # Pretend we're not in any relations + def containing_relation_members + return [] + end end