Improve handling of user to user messages.

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 7b6162d8d0e612b68a44942dd2abe326dba6daee..d7a52c33617aaaedeaa4a0b1387555a8a701ac1c 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,8 +1,23 @@
 class OldNode < ActiveRecord::Base
   set_table_name 'nodes'
 class OldNode < ActiveRecord::Base
   set_table_name 'nodes'

+  
+  validates_presence_of :user_id, :timestamp
+  validates_inclusion_of :visible, :in => [ true, false ]
+  validates_numericality_of :latitude, :longitude
+  validate :validate_position

 
   belongs_to :user
 
 
   belongs_to :user
 

+  def validate_position
+    errors.add_to_base("Node is not in the world") unless in_world?
+  end
+
+  def in_world?
+    return false if self.latitude < -90 or self.latitude > 90
+    return false if self.longitude < -180 or self.longitude > 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


@@ -20,10 +35,10 @@ class OldNode < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s
     el1['id'] = self.id.to_s
     el1['lat'] = self.latitude.to_s
     el1['lon'] = self.longitude.to_s

+    el1['user'] = self.user.display_name if self.user.data_public?

     Node.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1
   end
     Node.split_tags(el1, self.tags)
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1
   end

-

 end
 end