X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/64a5e21f53be132cd5fe3265230c6cdc00ccabaa..ee1da786493f8e0ea330195e17361bcb4a97efb7:/app/models/old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 018284528..91b5a1a8e 100644
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,24 +1,20 @@
-class OldNode < ActiveRecord::Base 
- 	include GeoRecord
+class OldNode < ActiveRecord::Base
+  include GeoRecord
+  include ConsistencyValidations
+
   set_table_name '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
 
-  belongs_to :user
+  belongs_to :changeset
  
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
-  def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
-  end
-
   def self.from_node(node)
     old_node = OldNode.new
     old_node.latitude = node.latitude
@@ -26,7 +22,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
@@ -43,7 +39,8 @@ 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
+    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')
@@ -64,7 +61,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
@@ -89,7 +86,8 @@ class OldNode < ActiveRecord::Base
 
   def tags=(t)
     @tags = t 
-  end 
+  end
+
   def tags_as_hash 
     hash = {} 
     Tags.split(self.tags) do |k,v|