X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5f8ab9e9244550b20b8d3bd97b3567df7020d06d..328d47e506972fededfa1080967224928c36a4cf:/app/models/old_way.rb?ds=inline diff --git a/app/models/old_way.rb b/app/models/old_way.rb index edf66aac3..f297cfc1a 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -1,12 +1,12 @@ class OldWay < ActiveRecord::Base set_table_name 'ways' - belongs_to :user + belongs_to :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 @@ -112,6 +112,35 @@ class OldWay < ActiveRecord::Base return el1 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 + + 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] + end + points + end + + def get_nodes_revert + 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 + # 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 + end + points << [oldnode.lon, oldnode.lat, id, v, oldnode.tags_as_hash] + end + points + end + # Temporary method to match interface to nodes def tags_as_hash return self.tags