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

Fixed AMF controller methods to hide redacted nodes

Browse source
This commit is contained in:
Matt Amos 2012-03-31 20:12:25 +01:00 • committed by Tom Hughes
parent 9c098816e5
commit 7c2ca3efb1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/amf_controller.rb
View file

@ -407,7 +407,7 @@ class AmfController < ApplicationController
revdates.push(a.timestamp)
unless revusers.has_key?(a.timestamp.to_i) then revusers[a.timestamp.to_i]=change_user(a) end
a.nds.each do |n|
Node.find(n).old_nodes.collect do |o|
Node.find(n).old_nodes.unredacted.collect do |o|
revdates.push(o.timestamp)
unless revusers.has_key?(o.timestamp.to_i) then revusers[o.timestamp.to_i]=change_user(o) end
end
@ -436,7 +436,7 @@ class AmfController < ApplicationController
def getnode_history(nodeid) #:doc:
begin
history = Node.find(nodeid).old_nodes.reverse.collect do |old_node|
history = Node.find(nodeid).old_nodes.unredacted.reverse.collect do |old_node|
[old_node.timestamp.succ.strftime("%d %b %Y, %H:%M:%S")] + change_user(old_node)
end
return ['node', nodeid, history]
@ -782,7 +782,7 @@ class AmfController < ApplicationController
n = Node.find(id)
v = n.version
unless timestamp == ''
n = OldNode.where("id = ? AND timestamp <= ?", id, timestamp).order("timestamp DESC").first
n = OldNode.where("node_id = ? AND timestamp <= ? AND redaction_id is NULL", id, timestamp).order("timestamp DESC").first
end
if n

2
app/models/old_way.rb
View file

@ -146,7 +146,7 @@ class OldWay < ActiveRecord::Base
def get_nodes_revert(timestamp)
points=[]
self.nds.each do |n|
oldnode = OldNode.where('node_id = ? AND timestamp <= ?', n, timestamp).order("timestamp DESC").first
oldnode = OldNode.where('node_id = ? AND timestamp <= ? AND redaction_id is NULL', n, timestamp).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