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
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/models/node.rb
View file

@ -4,6 +4,7 @@ class Node < ActiveRecord::Base
include GeoRecord
include ConsistencyValidations
include NotRedactable
include ObjectMetadata
self.table_name = "current_nodes"
@ -177,35 +178,13 @@ class Node < ActiveRecord::Base
def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
el1 = XML::Node.new 'node'
el1['id'] = self.id.to_s
el1['version'] = self.version.to_s
el1['changeset'] = self.changeset_id.to_s
add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache)
if self.visible?
el1['lat'] = self.lat.to_s
el1['lon'] = self.lon.to_s
end
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
self.tags.each do |k,v|
el2 = XML::Node.new('tag')
el2['k'] = k.to_s
@ -213,8 +192,6 @@ class Node < ActiveRecord::Base
el1 << el2
end
el1['visible'] = self.visible.to_s
el1['timestamp'] = self.timestamp.xmlschema
return el1
end

30
app/models/old_node.rb
View file

@ -1,6 +1,7 @@
class OldNode < ActiveRecord::Base
include GeoRecord
include ConsistencyValidations
include ObjectMetadata
self.table_name = "nodes"
self.primary_keys = "node_id", "version"
@ -45,35 +46,13 @@ class OldNode < ActiveRecord::Base
def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
el1 = XML::Node.new 'node'
el1['id'] = self.node_id.to_s
el1['version'] = self.version.to_s
el1['changeset'] = self.changeset_id.to_s
add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache)
if self.visible?
el1['lat'] = self.lat.to_s
el1['lon'] = self.lon.to_s
end
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
self.tags.each do |k,v|
el2 = XML::Node.new('tag')
el2['k'] = k.to_s
@ -81,11 +60,6 @@ class OldNode < ActiveRecord::Base
el1 << el2
end
el1['visible'] = self.visible.to_s
el1['timestamp'] = self.timestamp.xmlschema
el1['redacted'] = self.redaction.id.to_s if self.redacted?
return el1
end

29
app/models/old_relation.rb
View file

@ -1,5 +1,6 @@
class OldRelation < ActiveRecord::Base
include ConsistencyValidations
include ObjectMetadata
self.table_name = "relations"
self.primary_keys = "relation_id", "version"
@ -96,34 +97,8 @@ class OldRelation < ActiveRecord::Base
def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
el1 = XML::Node.new 'relation'
el1['id'] = self.relation_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
add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache)
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
el1['redacted'] = self.redaction.id.to_s if self.redacted?
self.old_members.each do |member|
e = XML::Node.new 'member'
e['type'] = member.member_type.to_s.downcase

29
app/models/old_way.rb
View file

@ -1,5 +1,6 @@
class OldWay < ActiveRecord::Base
include ConsistencyValidations
include ObjectMetadata
self.table_name = "ways"
self.primary_keys = "way_id", "version"
@ -95,34 +96,8 @@ class OldWay < ActiveRecord::Base
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
el1['version'] = self.version.to_s
el1['changeset'] = self.changeset_id.to_s
add_metadata_to_xml_node(el1, self, changeset_cache, user_display_name_cache)
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
el1['redacted'] = self.redaction.id.to_s if self.redacted?
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

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

27
app/models/way.rb
View file

@ -3,6 +3,7 @@ class Way < ActiveRecord::Base
include ConsistencyValidations
include NotRedactable
include ObjectMetadata
self.table_name = "current_ways"
@ -102,31 +103,7 @@ class Way < ActiveRecord::Base
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
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)
# make sure nodes are output in sequence_id order
ordered_nodes = []

30
lib/object_metadata.rb Normal file
View file

@ -0,0 +1,30 @@
module ObjectMetadata
def add_metadata_to_xml_node(el, osm, changeset_cache, user_display_name_cache)
el['changeset'] = osm.changeset_id.to_s
el['redacted'] = osm.redaction.id.to_s if osm.redacted?
el['timestamp'] = osm.timestamp.xmlschema
el['version'] = osm.version.to_s
el['visible'] = osm.visible.to_s
if changeset_cache.key?(osm.changeset_id)
# use the cache if available
else
changeset_cache[osm.changeset_id] = osm.changeset.user_id
end
user_id = changeset_cache[osm.changeset_id]
if user_display_name_cache.key?(user_id)
# use the cache if available
elsif osm.changeset.user.data_public?
user_display_name_cache[user_id] = osm.changeset.user.display_name
else
user_display_name_cache[user_id] = nil
end
unless user_display_name_cache[user_id].nil?
el['user'] = user_display_name_cache[user_id]
el['uid'] = user_id.to_s
end
end
end