From bf31791f65fee149b660c1395d59204309f906fa Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 28 Apr 2009 13:40:30 +0000 Subject: [PATCH] Add a changeset cache to stop us looking up the same changeset over and over again when processing a map call. --- app/controllers/api_controller.rb | 7 ++++--- app/controllers/relation_controller.rb | 9 +++++---- app/controllers/search_controller.rb | 7 ++++--- app/models/node.rb | 24 +++++++++++++++--------- app/models/relation.rb | 24 +++++++++++++++--------- app/models/way.rb | 22 ++++++++++++++-------- 6 files changed, 57 insertions(+), 36 deletions(-) diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 1af148455..c0af0d3e5 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -157,11 +157,12 @@ class ApiController < ApplicationController end visible_nodes = {} + changeset_cache = {} user_display_name_cache = {} @nodes.each do |node| if node.visible? - doc.root << node.to_xml_node(user_display_name_cache) + doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) visible_nodes[node.id] = node end end @@ -169,7 +170,7 @@ class ApiController < ApplicationController way_ids = Array.new ways.each do |way| if way.visible? - doc.root << way.to_xml_node(visible_nodes, user_display_name_cache) + doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) way_ids << way.id end end @@ -187,7 +188,7 @@ class ApiController < ApplicationController # this "uniq" may be slightly inefficient; it may be better to first collect and output # all node-related relations, then find the *not yet covered* way-related ones etc. relations.uniq.each do |relation| - doc.root << relation.to_xml_node(user_display_name_cache) + doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache) end response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\"" diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb index a249e42a0..440c69550 100644 --- a/app/controllers/relation_controller.rb +++ b/app/controllers/relation_controller.rb @@ -120,26 +120,27 @@ class RelationController < ApplicationController # create XML. doc = OSM::API.new.get_xml_doc visible_nodes = {} + changeset_cache = {} user_display_name_cache = {} nodes.each do |node| if node.visible? # should be unnecessary if data is consistent. - doc.root << node.to_xml_node(user_display_name_cache) + doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) visible_nodes[node.id] = node end end ways.each do |way| if way.visible? # should be unnecessary if data is consistent. - doc.root << way.to_xml_node(visible_nodes, user_display_name_cache) + doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) end end relations.each do |rel| if rel.visible? # should be unnecessary if data is consistent. - doc.root << rel.to_xml_node(user_display_name_cache) + doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache) end end # finally add self and output - doc.root << relation.to_xml_node(user_display_name_cache) + doc.root << relation.to_xml_node(changeset_cache, user_display_name_cache) render :text => doc.to_s, :content_type => "text/xml" else diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 17326db07..b411a70a2 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -111,19 +111,20 @@ class SearchController < ApplicationController # Print visible_nodes = {} + changeset_cache = {} user_display_name_cache = {} doc = OSM::API.new.get_xml_doc nodes.each do |node| - doc.root << node.to_xml_node(user_display_name_cache) + doc.root << node.to_xml_node(changeset_cache, user_display_name_cache) visible_nodes[node.id] = node end ways.each do |way| - doc.root << way.to_xml_node(visible_nodes, user_display_name_cache) + doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache) end relations.each do |rel| - doc.root << rel.to_xml_node(user_display_name_cache) + doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache) end render :text => doc.to_s, :content_type => "text/xml" end diff --git a/app/models/node.rb b/app/models/node.rb index d5967c2fa..bd51d6c50 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -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 + else + changeset_cache[self.changeset_id] = self.changeset.user_id + end + + 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[self.changeset.user_id] = self.changeset.user.display_name + user_display_name_cache[user_id] = self.changeset.user.display_name else - user_display_name_cache[self.changeset.user_id] = nil + user_display_name_cache[user_id] = nil 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 + 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| diff --git a/app/models/relation.rb b/app/models/relation.rb index f9bba9853..d2602f497 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -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 + else + changeset_cache[self.changeset_id] = self.changeset.user_id + end + + 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[self.changeset.user_id] = self.changeset.user.display_name + user_display_name_cache[user_id] = self.changeset.user.display_name else - user_display_name_cache[self.changeset.user_id] = nil + user_display_name_cache[user_id] = nil 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 + 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| diff --git a/app/models/way.rb b/app/models/way.rb index 2b6f562be..52d280209 100644 --- a/app/models/way.rb +++ b/app/models/way.rb @@ -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 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 user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id) + if user_display_name_cache.key?(user_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 + user_display_name_cache[user_id] = self.changeset.user.display_name else - user_display_name_cache[self.changeset.user_id] = nil + user_display_name_cache[user_id] = nil 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 + 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 -- 2.43.2