fix problematic merge

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 2d4e9ef8ab12381a92b22cd13d7ae2b2ca6b47cb..92cc39678d767b32e209d96a86fd254063be75af 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -76,6 +76,12 @@ class Trace < ActiveRecord::Base
     return `file -bi #{trace_name}`.chomp
   end
 
+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end
+
   def to_xml_node
     el1 = XML::Node.new 'gpx_file'
     el1['id'] = self.id.to_s