Tidy up mail notifiers and make them more rails style rather then

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 0bb676ef51f379c4b2177f13da96f5d148e86744..464849157b90504aa7f25722be0dcb85fbabf931 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,7 +1,22 @@
-class OldNode < ActiveRecord::Base
+class OldNode < GeoRecord

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


@@ -18,13 +33,12 @@ class OldNode < ActiveRecord::Base
   def to_xml_node
     el1 = XML::Node.new 'node'
     el1['id'] = self.id.to_s
   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['lat'] = self.lat.to_s
+    el1['lon'] = self.lon.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
     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