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

Return usernames correctly.

Browse source
This commit is contained in:
Tom Hughes 2007-06-19 11:23:12 +00:00
parent 69e0457dea
commit 7ab154a0ae
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/node.rb
View file

@ -84,15 +84,17 @@ class Node < ActiveRecord::Base
el1['lat'] = self.latitude.to_s el1['lat'] = self.latitude.to_s
el1['lon'] = self.longitude.to_s el1['lon'] = self.longitude.to_s
# el['user'] = self.user.display_name if self.user.data_public?
user_display_name_cache = {} if user_display_name_cache.nil? user_display_name_cache = {} if user_display_name_cache.nil?
if user_display_name_cache and user_display_name_cache[self.user_id] if user_display_name_cache and user_display_name_cache[self.user_id]
# use the cache if available # use the cache if available
else elsif self.user.data_public?
user_display_name_cache[self.user_id] = self.user.display_name user_display_name_cache[self.user_id] = self.user.display_name
else
user_display_name_cache[self.user_id] = nil
end end
el1['user'] = user_display_name_cache[self.user_id] el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
Node.split_tags(el1, self.tags) Node.split_tags(el1, self.tags)
el1['visible'] = self.visible.to_s el1['visible'] = self.visible.to_s

8
app/models/segment.rb
View file

@ -80,14 +80,16 @@ class Segment < ActiveRecord::Base
el1['to'] = self.node_b.to_s el1['to'] = self.node_b.to_s
user_display_name_cache = {} if user_display_name_cache.nil? user_display_name_cache = {} if user_display_name_cache.nil?
if user_display_name_cache and user_display_name_cache[self.user_id] if user_display_name_cache and user_display_name_cache[self.user_id]
# use the cache if available # use the cache if available
else elsif self.user.data_public?
user_display_name_cache[self.user_id] = self.user.display_name user_display_name_cache[self.user_id] = self.user.display_name
else
user_display_name_cache[self.user_id] = nil
end end
#el1['user'] = self.user.display_name if self.user.data_public? el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
el1['user'] = user_display_name_cache[self.user_id]
Segment.split_tags(el1, self.tags) Segment.split_tags(el1, self.tags)
el1['visible'] = self.visible.to_s el1['visible'] = self.visible.to_s

7
app/models/way.rb
View file

@ -60,12 +60,13 @@ class Way < ActiveRecord::Base
if user_display_name_cache and user_display_name_cache[self.user_id] if user_display_name_cache and user_display_name_cache[self.user_id]
# use the cache if available # use the cache if available
else elsif self.user.data_public?
user_display_name_cache[self.user_id] = self.user.display_name user_display_name_cache[self.user_id] = self.user.display_name
else
user_display_name_cache[self.user_id] = nil
end end
#el1['user'] = self.user.display_name if self.user.data_public? el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
el1['user'] = user_display_name_cache[self.user_id]
# make sure segments are output in sequence_id order # make sure segments are output in sequence_id order
ordered_segments = [] ordered_segments = []