From: Dave Stubbs <osm@randomjunk.co.uk>
Date: Sun, 9 Nov 2008 16:43:09 +0000 (+0000)
Subject: update nodes/ways/relation XML to include user id as well as display name
X-Git-Tag: live~7619^2~174
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/322d293007eb75eedae7bd6138dc5abc3143d972

update nodes/ways/relation XML to include user id as well as display name
---

diff --git a/app/models/node.rb b/app/models/node.rb
index cf7aedae8..391b50dcd 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -222,7 +222,10 @@ class Node < ActiveRecord::Base
       user_display_name_cache[self.changeset.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
+    if not user_display_name_cache[self.changeset.user_id].nil?
+      el1['user'] = user_display_name_cache[self.changeset.user_id]
+      el1['uid'] = self.changeset.user_id.to_s
+    end
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 91b5a1a8e..03aff0fc6 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -40,7 +40,10 @@ class OldNode < ActiveRecord::Base
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
     el1['changeset'] = self.changeset.id.to_s
-    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?
+    if self.changeset.user.data_public?
+      el1['user'] = self.changeset.user.display_name
+      el1['uid'] = self.changeset.user.id.to_s
+    end
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index b7e7248d9..491b444a6 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -99,7 +99,10 @@ class OldRelation < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?
+    if self.changeset.user.data_public?
+      el1['user'] = self.changeset.user.display_name
+      el1['uid'] = self.changeset.user.id.to_s
+    end
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset_id.to_s
     
diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 44155d05c..ce856e208 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -96,7 +96,10 @@ class OldWay < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?
+    if self.changeset.user.data_public?
+      el1['user'] = self.changeset.user.display_name
+      el1['uid'] = self.changeset.user.id.to_s
+    end
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset.id.to_s
     
diff --git a/app/models/relation.rb b/app/models/relation.rb
index be990e589..1bbb1d8e9 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -83,7 +83,10 @@ class Relation < ActiveRecord::Base
       user_display_name_cache[self.changeset.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
+    if not user_display_name_cache[self.changeset.user_id].nil?
+      el1['user'] = user_display_name_cache[self.changeset.user_id]
+      el1['uid'] = self.changeset.user_id.to_s
+    end
 
     self.relation_members.each do |member|
       p=0
diff --git a/app/models/way.rb b/app/models/way.rb
index be6531def..da7b8d733 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -101,7 +101,10 @@ class Way < ActiveRecord::Base
       user_display_name_cache[self.changeset.user_id] = nil
     end
 
-    el1['user'] = user_display_name_cache[self.changeset.user_id] unless user_display_name_cache[self.changeset.user_id].nil?
+    if not user_display_name_cache[self.changeset.user_id].nil?
+      el1['user'] = user_display_name_cache[self.changeset.user_id]
+      el1['uid'] = self.changeset.user_id.to_s
+    end
 
     # make sure nodes are output in sequence_id order
     ordered_nodes = []