Clicking on nearby markers displays a popup showing the name of the mapper with a...

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

diff --git a/app/models/segment.rb b/app/models/segment.rb
index cf0ec206140c19f6ada667d513906faa1ddceec1..b6f60ec3f9dd9d2c181d229ff85c958fb2e15f31 100644 (file)
--- a/app/models/segment.rb
+++ b/app/models/segment.rb
@@ -56,6 +56,7 @@ class Segment < ActiveRecord::Base
   def save_with_history
     begin
       Segment.transaction do
   def save_with_history
     begin
       Segment.transaction do

+        self.timestamp = Time.now

         self.save
         old_segment = OldSegment.from_segment(self)
         old_segment.save
         self.save
         old_segment = OldSegment.from_segment(self)
         old_segment.save


@@ -67,21 +68,25 @@ class Segment < ActiveRecord::Base
   end
 
   def to_xml
   end
 
   def to_xml

-    doc = XML::Document.new
-    doc.encoding = 'UTF-8' 
-    root = XML::Node.new 'osm'
-    root['version'] = API_VERSION
-    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
 
     return doc
   end
 

-  def to_xml_node
+  def to_xml_node(user_display_name_cache  = nil)

     el1 = XML::Node.new 'segment'
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s
     el1 = XML::Node.new 'segment'
     el1['id'] = self.id.to_s
     el1['from'] = self.node_a.to_s
     el1['to'] = self.node_b.to_s

+    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]
+

     Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     Segment.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema