Fix typo

[rails.git] / app / models / old_node.rb

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 42f55f2d0fbd6db5ef66390e3bd08a192482ceb3..5e3638347a642a55ec8e33ca180012532709233b 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,25 +1,25 @@
 class OldNode < ActiveRecord::Base
   include GeoRecord
 class OldNode < ActiveRecord::Base
   include GeoRecord

+  include ConsistencyValidations

 
   set_table_name 'nodes'
   
 
   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_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?
   end
 
  
   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
   def self.from_node(node)
     old_node = OldNode.new
     old_node.latitude = node.latitude


@@ -27,7 +27,7 @@ class OldNode < ActiveRecord::Base
     old_node.visible = node.visible
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp
     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
     old_node.id = node.id
     old_node.version = node.version
     return old_node


@@ -44,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['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')
 
     self.tags.each do |k,v|
       el2 = XML::Node.new('tag')


@@ -65,7 +69,7 @@ class OldNode < ActiveRecord::Base
     clear_aggregation_cache
     clear_association_cache
     #ok from here
     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
    
     self.tags.each do |k,v|
       tag = OldNodeTag.new


@@ -90,13 +94,10 @@ class OldNode < ActiveRecord::Base
 
   def tags=(t)
     @tags = t 
 
   def tags=(t)
     @tags = t 

-  end 
+  end
+

   def tags_as_hash 
   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 
   end 
  
   # Pretend we're not in any ways