X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/72e59b49fa0512e5c7d16217edce62225094ffe3..69e1c2c3ca084e6bbd0efc5648a65077b0c82225:/app/models/old_way.rb diff --git a/app/models/old_way.rb b/app/models/old_way.rb index 474c3e02b..591389243 100644 --- a/app/models/old_way.rb +++ b/app/models/old_way.rb @@ -1,10 +1,13 @@ class OldWay < ActiveRecord::Base include ConsistencyValidations - include Redactable 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" @@ -89,38 +92,50 @@ class OldWay < ActiveRecord::Base @tags = t end - def to_xml_node + def to_xml_node(changeset_cache = {}, user_display_name_cache = {}) el1 = XML::Node.new 'way' el1['id'] = self.way_id.to_s el1['visible'] = self.visible.to_s el1['timestamp'] = self.timestamp.xmlschema - 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 + el1['changeset'] = self.changeset_id.to_s + + if changeset_cache.key?(self.changeset_id) + # use the cache if available + else + changeset_cache[self.changeset_id] = self.changeset.user_id + end + + user_id = changeset_cache[self.changeset_id] - if self.redacted? - el1['redacted'] = self.redaction.title + if user_display_name_cache.key?(user_id) + # use the cache if available + elsif self.changeset.user.data_public? + user_display_name_cache[user_id] = self.changeset.user.display_name + else + user_display_name_cache[user_id] = nil end + + if not user_display_name_cache[user_id].nil? + el1['user'] = user_display_name_cache[user_id] + el1['uid'] = user_id.to_s + end + + el1['redacted'] = self.redaction.id.to_s if self.redacted? - unless self.redacted? and (@user.nil? or not @user.moderator?) - # If a way is redacted and the user isn't a moderator, only show - # meta-data from this revision, but no real data. - 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 - end + 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 + end - self.old_tags.each do |tag| - e = XML::Node.new 'tag' - e['k'] = tag.k - e['v'] = tag.v - el1 << e - 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 end @@ -143,7 +158,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 <= ?', 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