cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

history stuff should be working now (haha)

Browse source
This commit is contained in:
Richard Fairhurst 2009-02-25 22:04:22 +00:00
parent e827a04607
commit dfa81462b8
3 changed files with 22 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/old_way.rb
View file

@ -124,12 +124,14 @@ class OldWay < ActiveRecord::Base
# 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 << [node.lon, node.lat, n, node.version, node.tags_as_hash, node.visible]
end
points
end
@ -139,12 +141,12 @@ class OldWay < ActiveRecord::Base
self.nds.each do |n|
oldnode=OldNode.find(:first, :conditions=>['id=? AND timestamp<=?',n,timestamp], :order=>"timestamp DESC")
curnode=Node.find(n)
id=n; v=curnode.visible ? 1 : 0
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.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