rails updates

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

diff --git a/app/models/node.rb b/app/models/node.rb
index b83d934a28364239a700999292a4acdb94231c05..c37be933a26eef84c2e5c24a45cc7b58b0b4fd32 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -2,11 +2,14 @@ class Node < ActiveRecord::Base
   require 'xml/libxml'
   set_table_name 'current_nodes'
 
   require 'xml/libxml'
   set_table_name 'current_nodes'
 

+  validates_numericality_of :latitude
+  validates_numericality_of :longitude
+  # FIXME validate lat and lon within the world
+

   has_many :old_nodes, :foreign_key => :id
   belongs_to :user
 
 
   has_many :old_nodes, :foreign_key => :id
   belongs_to :user
 
 

-

   def self.from_xml(xml, create=false)
     p = XML::Parser.new
     p.string = xml
   def self.from_xml(xml, create=false)
     p = XML::Parser.new
     p.string = xml


@@ -28,12 +31,14 @@ class Node < ActiveRecord::Base
         node.id = pt['id'].to_i
       end
 
         node.id = pt['id'].to_i
       end
 

-      node.visible = pt['visible'] == '1'
+      node.visible = pt['visible'] and pt['visible'] == 'true'

 
       if create
         node.timestamp = Time.now
       else
 
       if create
         node.timestamp = Time.now
       else

-        node.timestamp = Time.parse(pt['timestamp'])
+        if pt['timestamp']
+          node.timestamp = Time.parse(pt['timestamp'])
+        end

       end
 
       tags = []
       end
 
       tags = []


@@ -54,41 +59,35 @@ class Node < ActiveRecord::Base
   def save_with_history
     begin
       Node.transaction do
   def save_with_history
     begin
       Node.transaction do

-        old_node = OldNode.from_node(this)
-        this.save
+        self.save
+        old_node = OldNode.from_node(self)

         old_node.save
       end
       return true
     rescue Exception => ex
       return nil
         old_node.save
       end
       return true
     rescue Exception => ex
       return nil

-

     end
   end
 
     end
   end
 

-  def self.to_xml
+  def to_xml

     doc = XML::Document.new
     doc = XML::Document.new

-
-    doc.encoding = "UTF-8"  
+    doc.encoding = 'UTF-8' 

     root = XML::Node.new 'osm'
     root['version'] = '0.4'
     root['generator'] = 'OpenStreetMap server'
     doc.root = root
     el1 = XML::Node.new 'node'
     root = XML::Node.new 'osm'
     root['version'] = '0.4'
     root['generator'] = 'OpenStreetMap server'
     doc.root = root
     el1 = XML::Node.new 'node'

-    el1['id'] = this.id.to_s
-    el1['lat'] = this.latitude.to_s
-    el1['lon'] = this.longitude.to_s
-    split_tags(el1, this.tags)
-    el1['visible'] = thiss.visible.to_s
-    el1['timestamp'] = this.timestamp.xmlschema
+    el1['id'] = self.id.to_s
+    el1['lat'] = self.latitude.to_s
+    el1['lon'] = self.longitude.to_s
+    Node.split_tags(el1, self.tags)
+    el1['visible'] = self.visible.to_s
+    el1['timestamp'] = self.timestamp.xmlschema

     root << el1
     root << el1

-
-    return root
-
+    return doc

   end
 
   end
 

-
-  private
-  def split_tags(el, tags)
+  def self.split_tags(el, tags)

     tags.split(';').each do |tag|
       parts = tag.split('=')
       key = ''
     tags.split(';').each do |tag|
       parts = tag.split('=')
       key = ''


@@ -104,6 +103,4 @@ class Node < ActiveRecord::Base
     end
   end
 
     end
   end
 

-
-

 end
 end