X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9a171c74581e0eb80794e2c9ed92e1b8faffa42..a22b0c1b64a67e46bcecbce41b07fc7a53fb0632:/app/models/old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 6b6b71b53..5e3638347 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,14 +1,20 @@
 class OldNode < ActiveRecord::Base
   include GeoRecord
+  include ConsistencyValidations
 
   set_table_name 'nodes'
   
-  validates_presence_of :user_id, :timestamp
+  # Should probably have the composite primary key set in the model
+  # however there are some weird bugs happening when you do
+  #set_primary_keys :id, :version
+  
+  validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
   validates_numericality_of :latitude, :longitude
   validate :validate_position
+  validates_associated :changeset
 
-  belongs_to :user
+  belongs_to :changeset
  
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
@@ -21,7 +27,7 @@ class OldNode < ActiveRecord::Base
     old_node.visible = node.visible
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp
-    old_node.user_id = node.user_id
+    old_node.changeset_id = node.changeset_id
     old_node.id = node.id
     old_node.version = node.version
     return old_node
@@ -38,7 +44,11 @@ class OldNode < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['lat'] = self.lat.to_s
     el1['lon'] = self.lon.to_s
-    el1['user'] = self.user.display_name if self.user.data_public?
+    el1['changeset'] = self.changeset.id.to_s
+    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')
@@ -59,7 +69,7 @@ class OldNode < ActiveRecord::Base
     clear_aggregation_cache
     clear_association_cache
     #ok from here
-    @attributes.update(OldNode.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
+    @attributes.update(OldNode.find(:first, :conditions => ['id = ? AND timestamp = ? AND version = ?', self.id, self.timestamp, self.version]).instance_variable_get('@attributes'))
    
     self.tags.each do |k,v|
       tag = OldNodeTag.new
@@ -87,11 +97,7 @@ class OldNode < ActiveRecord::Base
   end
 
   def tags_as_hash 
-    hash = {} 
-    Tags.split(self.tags) do |k,v| 
-      hash[k] = v 
-    end 
-    hash 
+    return self.tags
   end 
  
   # Pretend we're not in any ways