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 e7d803044a4bd39ac658681e27ce70bda3156466..ca179e0e9189d8a86dcefd97d61841c1d1f7349b 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,17 +1,23 @@
 class OldNode < ActiveRecord::Base
   include GeoRecord
 class OldNode < ActiveRecord::Base
   include GeoRecord

+  include ConsistencyValidations

 
   set_table_name 'nodes'
   
 
   set_table_name 'nodes'
   

+  # 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_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 :changeset
  
   def validate_position
 
   belongs_to :changeset
  
   def validate_position

-    errors.add_to_base("Node is not in the world") unless in_world?
+    errors.add(:base, "Node is not in the world") unless in_world?

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


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


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


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


@@ -88,11 +97,7 @@ class OldNode < ActiveRecord::Base
   end
 
   def tags_as_hash 
   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 
   end 
  
   # Pretend we're not in any ways