diary / user bits

[rails.git] / app / models / way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index 55a578acdbbd5d42a32476618b76bbd453039b33..7dffcfef1886bf456f1610d8bab944b347c36c67 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -45,15 +45,8 @@ class Way < ActiveRecord::Base
   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
 
@@ -62,12 +55,17 @@ class Way < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    
-    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
-    end
+    el1['user'] = self.user.display_name if self.user.data_public?
+    # make sure segments are output in sequence_id order\r
+    ordered_segments = []\r
+    self.way_segments.each do |seg| \r
+      ordered_segments[seg.sequence_id] = seg.segment_id.to_s
+    end\r
+    ordered_segments.each do |seg_id|\r
+      e = XML::Node.new 'seg'\r
+      e['id'] = seg_id\r
+      el1 << e\r
+    end\r
  
     self.way_tags.each do |tag|
       e = XML::Node.new 'tag'