api fixes

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

diff --git a/app/models/node.rb b/app/models/node.rb
index b83d934a28364239a700999292a4acdb94231c05..6eecc853d12a585577a95e36c3a1e87331bf5fd4 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,12 +1,15 @@
 class Node < ActiveRecord::Base
   require 'xml/libxml'
   set_table_name 'current_nodes'
 class Node < ActiveRecord::Base
   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


@@ -24,16 +27,20 @@ class Node < ActiveRecord::Base
         return nil
       end
 
         return nil
       end
 

-      if pt['id'] != '0'
-        node.id = pt['id'].to_i
+      unless create
+        if pt['id'] != '0'
+          node.id = pt['id'].to_i
+        end

       end
 
       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 +61,46 @@ 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.timestamp = Time.now
+        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
-    doc = XML::Document.new
+  def to_xml
+    doc = OSM::API.new.get_xml_doc
+    doc.root << to_xml_node()
+    return doc
+  end

 
 

-    doc.encoding = "UTF-8"  
-    root = XML::Node.new 'osm'
-    root['version'] = '0.4'
-    root['generator'] = 'OpenStreetMap server'
-    doc.root = root
+  def to_xml_node(user_display_name_cache = nil)

     el1 = XML::Node.new 'node'
     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
-    root << el1
+    el1['id'] = self.id.to_s
+    el1['lat'] = self.latitude.to_s
+    el1['lon'] = self.longitude.to_s
+
+    # el['user'] = self.user.display_name if self.user.data_public?
+    user_display_name_cache = {} if user_display_name_cache.nil?
+    if user_display_name_cache and user_display_name_cache[self.user_id]
+      # use the cache if available
+    else
+      user_display_name_cache[self.user_id] = self.user.display_name
+    end

 
 

-    return root
+    el1['user'] = user_display_name_cache[self.user_id]

 
 

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

   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 = ''


@@ -96,14 +108,11 @@ class Node < ActiveRecord::Base
       key = parts[0].strip unless parts[0].nil?
       val = parts[1].strip unless parts[1].nil?
       if key != '' && val != ''
       key = parts[0].strip unless parts[0].nil?
       val = parts[1].strip unless parts[1].nil?
       if key != '' && val != ''

-        el2 = Node.new('tag')
+        el2 = XML::Node.new('tag')

         el2['k'] = key.to_s
         el2['v'] = val.to_s
         el << el2
       end
     end
   end
         el2['k'] = key.to_s
         el2['v'] = val.to_s
         el << el2
       end
     end
   end

-
-
-

 end
 end