Fix form_for arguments

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 0182845282ebc38f4f5d9f14ec1730a94ae8f468..ca179e0e9189d8a86dcefd97d61841c1d1f7349b 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,22 +1,23 @@
-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
  
   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
+    errors.add(:base, "Node is not in the world") unless in_world?

   end
 
   def self.from_node(node)
   end
 
   def self.from_node(node)


@@ -26,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


@@ -43,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')


@@ -64,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.where('id = ? AND timestamp = ? AND version = ?', self.id, self.timestamp, self.version).first.instance_variable_get('@attributes'))

    
     self.tags.each do |k,v|
       tag = OldNodeTag.new
    
     self.tags.each do |k,v|
       tag = OldNodeTag.new


@@ -79,7 +84,7 @@ class OldNode < ActiveRecord::Base
   def tags
     unless @tags
         @tags = Hash.new
   def tags
     unless @tags
         @tags = Hash.new

-        OldNodeTag.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |tag|
+        OldNodeTag.where("id = ? AND version = ?", self.id, self.version).each do |tag|

             @tags[tag.k] = tag.v
         end
     end
             @tags[tag.k] = tag.v
         end
     end


@@ -89,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