end
def to_xml
- doc = XML::Document.new
- doc.encoding = 'UTF-8'
- root = XML::Node.new 'osm'
- root['version'] = '0.4'
- root['generator'] = 'OpenStreetMap server'
-
- doc.root = root
-
- root << to_xml_node()
+ doc = OSM::API.new.get_xml_doc
+ doc.root << to_xml_node()
return doc
end
- def to_xml_node
+ def to_xml_node(visible_segments = nil, user_display_name_cache = nil)
el1 = XML::Node.new 'way'
el1['id'] = self.id.to_s
el1['visible'] = self.visible.to_s
el1['timestamp'] = self.timestamp.xmlschema
+
+ user_display_name_cache = {} if user_display_name_cache.nil?
- self.way_segments.each do |seg| # FIXME need to make sure they come back in the right order
- e = XML::Node.new 'seg'
- e['id'] = seg.segment_id.to_s
- el1 << e
+ if user_display_name_cache and user_display_name_cache[self.user_id]
+ # use the cache if available
+ else
+ user_display_name_cache[self.user_id] = self.user.display_name
+ end
+
+ #el1['user'] = self.user.display_name if self.user.data_public?
+ el1['user'] = user_display_name_cache[self.user_id]
+
+ # make sure segments are output in sequence_id order
+ ordered_segments = []
+ self.way_segments.each do |seg|
+ if visible_segments
+ # if there is a list of visible segments then use that to weed out deleted segments
+ if visible_segments[seg.segment_id]
+ ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+ end
+ else
+ # otherwise, manually go to the db to check things
+ if seg.segment.visible? and seg.segment.from_node.visible? and seg.segment.to_node.visible?
+ ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+ end
+ end
+ end
+
+ ordered_segments.each do |seg_id|
+ if seg_id and seg_id != '0'
+ e = XML::Node.new 'seg'
+ e['id'] = seg_id
+ el1 << e
+ end
end
self.way_tags.each do |tag|
return el1
end
-
def segs
- @segs = Array.new unless @segs
+ unless @segs
+ @segs = Array.new
+ self.way_segments.each do |seg|
+ @segs += [seg.segment_id]
+ end
+ end
@segs
end
def tags
- @tags = Hash.new unless @tags
+ unless @tags
+ @tags = Hash.new
+ self.way_tags.each do |tag|
+ @tags[tag.k] = tag.v
+ end
+ end
@tags
end