X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/40414cf324309d13d207f9339b7f40ce05a9fa2a..e1b205913c9afd6b41684add7308cef4613112e2:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 2efdb1bc9..d152be6d3 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -4,8 +4,8 @@ class Node < ActiveRecord::Base
   include GeoRecord
 
   set_table_name 'current_nodes'
-  
-  validates_presence_of :user_id, :timestamp
+
+  validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position
@@ -77,6 +77,7 @@ class Node < ActiveRecord::Base
     node.version = pt['version']
     node.lat = pt['lat'].to_f
     node.lon = pt['lon'].to_f
+    node.changeset_id = pt['changeset'].to_i
 
     return nil unless node.in_world?
 
@@ -151,7 +152,8 @@ class Node < ActiveRecord::Base
       raise OSM::APIVersionMismatchError.new(new_node.version, version)
     end
 
-    self.user_id = user.id
+    # FIXME logic need looked at
+    self.changeset_id = user.id
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
     self.tags = new_node.tags
@@ -170,18 +172,20 @@ class Node < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
-
+    el1['version'] = self.version.to_s
+    el1['changeset'] = self.changeset_id.to_s
+    
     user_display_name_cache = {} if user_display_name_cache.nil?
 
-    if user_display_name_cache and user_display_name_cache.key?(self.user_id)
+    if user_display_name_cache and user_display_name_cache.key?(self.changeset.user_id)
       # use the cache if available
-    elsif self.user.data_public?
-      user_display_name_cache[self.user_id] = self.user.display_name
+    elsif self.changeset.user.data_public?
+      user_display_name_cache[self.changeset.user_id] = self.changeset.user.display_name
     else
-      user_display_name_cache[self.user_id] = nil
+      user_display_name_cache[self.changeset.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
+    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
@@ -219,6 +223,4 @@ class Node < ActiveRecord::Base
     @tags[k] = v
   end
 
-
-
 end