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

Add a changeset cache to stop us looking up the same changeset over

Browse source 
and over again when processing a map call.
This commit is contained in:
Tom Hughes 2009-04-28 13:40:30 +00:00
parent 7ee10192eb
commit bf31791f65
6 changed files with 61 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/models/node.rb
View file

@ -188,27 +188,33 @@ class Node < ActiveRecord::Base
return doc
end
def to_xml_node(user_display_name_cache = nil)
def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
el1 = XML::Node.new 'node'
el1['id'] = self.id.to_s
el1['lat'] = self.lat.to_s
el1['lon'] = self.lon.to_s
el1['version'] = self.version.to_s
el1['changeset'] = self.changeset_id.to_s
user_display_name_cache = {} if user_display_name_cache.nil?
if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
if changeset_cache.key?(self.changeset_id)
# use the cache if available
elsif self.changeset.user.data_public?
user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
else
user_display_name_cache[self.changeset.user_id] = nil
changeset_cache[self.changeset_id] = self.changeset.user_id
end
if not user_display_name_cache[self.changeset.user_id].nil?
el1['user'] = user_display_name_cache[self.changeset.user_id]
el1['uid'] = self.changeset.user_id.to_s
user_id = changeset_cache[self.changeset_id]
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
self.tags.each do |k,v|

26
app/models/relation.rb
View file

@ -87,7 +87,7 @@ class Relation < ActiveRecord::Base
return doc
end
def to_xml_node(user_display_name_cache = nil)
def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
el1 = XML::Node.new 'relation'
el1['id'] = self.id.to_s
el1['visible'] = self.visible.to_s
@ -95,19 +95,25 @@ class Relation < ActiveRecord::Base
el1['version'] = self.version.to_s
el1['changeset'] = self.changeset_id.to_s
user_display_name_cache = {} if user_display_name_cache.nil?
if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
if changeset_cache.key?(self.changeset_id)
# use the cache if available
elsif self.changeset.user.data_public?
user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
else
user_display_name_cache[self.changeset.user_id] = nil
changeset_cache[self.changeset_id] = self.changeset.user_id
end
if not user_display_name_cache[self.changeset.user_id].nil?
el1['user'] = user_display_name_cache[self.changeset.user_id]
el1['uid'] = self.changeset.user_id.to_s
user_id = changeset_cache[self.changeset_id]
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
self.relation_members.each do |member|

26
app/models/way.rb
View file

@ -89,7 +89,7 @@ class Way < ActiveRecord::Base
return doc
end
def to_xml_node(visible_nodes = nil, user_display_name_cache = nil)
def to_xml_node(visible_nodes = nil, changeset_cache = {}, user_display_name_cache = {})
el1 = XML::Node.new 'way'
el1['id'] = self.id.to_s
el1['visible'] = self.visible.to_s
@ -97,19 +97,25 @@ class Way < ActiveRecord::Base
el1['version'] = self.version.to_s
el1['changeset'] = self.changeset_id.to_s
user_display_name_cache = {} if user_display_name_cache.nil?
if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
if changeset_cache.key?(self.changeset_id)
# use the cache if available
elsif self.changeset.user.data_public?
user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
else
user_display_name_cache[self.changeset.user_id] = nil
changeset_cache[self.changeset_id] = self.changeset.user_id
end
if not user_display_name_cache[self.changeset.user_id].nil?
el1['user'] = user_display_name_cache[self.changeset.user_id]
el1['uid'] = self.changeset.user_id.to_s
user_id = changeset_cache[self.changeset_id]
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
# make sure nodes are output in sequence_id order