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 339db9d08c7412db160023ae283dd84f33b22b37..d7a52c33617aaaedeaa4a0b1387555a8a701ac1c 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,13 +1,28 @@
 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
     old_node.longitude = node.longitude
   def self.from_node(node)
     old_node = OldNode.new
     old_node.latitude = node.latitude
     old_node.longitude = node.longitude

-    old_node.visible = 1
+    old_node.visible = node.visible

     old_node.tags = node.tags
     old_node.timestamp = node.timestamp
     old_node.user_id = node.user_id
     old_node.tags = node.tags
     old_node.timestamp = node.timestamp
     old_node.user_id = node.user_id


@@ -15,6 +30,15 @@ class OldNode < ActiveRecord::Base
     return old_node
   end
 
     return old_node
   end
 

-
-
+  def to_xml_node
+    el1 = XML::Node.new 'node'
+    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

 end
 end