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

Refactor generation of object metadata in API calls

Browse source 
Factor out duplicate from the object models into common code.
This commit is contained in:
Simon Legner 2013-12-03 23:02:27 +00:00 • committed by Tom Hughes
parent a6fb1ead5b
commit 413baecf6b
7 changed files with 42 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/models/relation.rb
View file

@ -3,6 +3,7 @@ class Relation < ActiveRecord::Base
include ConsistencyValidations
include NotRedactable
include ObjectMetadata
self.table_name = "current_relations"
@ -108,31 +109,7 @@ class Relation < ActiveRecord::Base
def to_xml_node(visible_members = nil, changeset_cache = {}, user_display_name_cache = {})
el1 = XML::Node.new 'relation'
el1['id'] = self.id.to_s
el1['visible'] = self.visible.to_s
el1['timestamp'] = self.timestamp.xmlschema
el1['version'] = self.version.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 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
add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache)
self.relation_members.each do |member|
p=0