X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/613e88c4a8728c2f1ab8a2fb9338762b947eac6a..1bbe59b6a77030c362f9991083aa7c06799b272d:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index c37be933a..6eecc853d 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,6 +1,7 @@
 class Node < ActiveRecord::Base
   require 'xml/libxml'
   set_table_name 'current_nodes'
+  
 
   validates_numericality_of :latitude
   validates_numericality_of :longitude
@@ -9,7 +10,6 @@ class Node < ActiveRecord::Base
   has_many :old_nodes, :foreign_key => :id
   belongs_to :user
 
-
   def self.from_xml(xml, create=false)
     p = XML::Parser.new
     p.string = xml
@@ -27,8 +27,10 @@ class Node < ActiveRecord::Base
         return nil
       end
 
-      if pt['id'] != '0'
-        node.id = pt['id'].to_i
+      unless create
+        if pt['id'] != '0'
+          node.id = pt['id'].to_i
+        end
       end
 
       node.visible = pt['visible'] and pt['visible'] == 'true'
@@ -59,6 +61,7 @@ class Node < ActiveRecord::Base
   def save_with_history
     begin
       Node.transaction do
+        self.timestamp = Time.now
         self.save
         old_node = OldNode.from_node(self)
         old_node.save
@@ -70,21 +73,31 @@ class Node < 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
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end
+
+  def to_xml_node(user_display_name_cache = nil)
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s
+
+    # el['user'] = self.user.display_name if self.user.data_public?
+    user_display_name_cache = {} if user_display_name_cache.nil?
+    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'] = user_display_name_cache[self.user_id]
+
     Node.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    root << el1
-    return doc
+    return el1
   end
 
   def self.split_tags(el, tags)
@@ -95,12 +108,11 @@ class Node < ActiveRecord::Base
       key = parts[0].strip unless parts[0].nil?
       val = parts[1].strip unless parts[1].nil?
       if key != '' && val != ''
-        el2 = Node.new('tag')
+        el2 = XML::Node.new('tag')
         el2['k'] = key.to_s
         el2['v'] = val.to_s
         el << el2
       end
     end
   end
-
 end