Fix diary RSS feed.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 7e78aaf592acfab37a89a9c20bbc084ea3b28ef5..59aa4d36ffd01ef845896ca1199594253a6ef0fe 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,5 +1,6 @@
-class Node < ActiveRecord::Base
+class Node < GeoRecord
   require 'xml/libxml'
+
   set_table_name 'current_nodes'
   
   validates_presence_of :user_id, :timestamp
@@ -9,14 +10,14 @@ class Node < ActiveRecord::Base
 
   has_many :old_nodes, :foreign_key => :id
   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 false if self.lat < -90 or self.lat > 90
+    return false if self.lon < -180 or self.lon > 180
     return true
   end
 
@@ -29,8 +30,8 @@ class Node < ActiveRecord::Base
       node = Node.new
 
       doc.find('//osm/node').each do |pt|
-        node.latitude = pt['lat'].to_f
-        node.longitude = pt['lon'].to_f
+        node.lat = pt['lat'].to_f
+        node.lon = pt['lon'].to_f
 
         return nil unless node.in_world?
 
@@ -56,10 +57,7 @@ class Node < ActiveRecord::Base
           tags << [tag['k'],tag['v']]
         end
 
-        tags = tags.collect { |k,v| "#{k}=#{v}" }.join(';')
-        tags = '' if tags.nil?
-
-        node.tags = tags
+        node.tags = Tags.join(tags)
       end
     rescue
       node = nil
@@ -86,8 +84,8 @@ class Node < ActiveRecord::Base
   def to_xml_node(user_display_name_cache = nil)
     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
 
     user_display_name_cache = {} if user_display_name_cache.nil?
 
@@ -101,25 +99,15 @@ class Node < ActiveRecord::Base
 
     el1['user'] = user_display_name_cache[self.user_id] unless user_display_name_cache[self.user_id].nil?
 
-    Node.split_tags(el1, self.tags)
+    Tags.split(self.tags) do |k,v|
+      el2 = XML::Node.new('tag')
+      el2['k'] = k.to_s
+      el2['v'] = v.to_s
+      el1 << el2
+    end
+
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1
   end
-
-  def self.split_tags(el, tags)
-    tags.split(';').each do |tag|
-      parts = tag.split('=')
-      key = ''
-      val = ''
-      key = parts[0].strip unless parts[0].nil?
-      val = parts[1].strip unless parts[1].nil?
-      if key != '' && val != ''
-        el2 = XML::Node.new('tag')
-        el2['k'] = key.to_s
-        el2['v'] = val.to_s
-        el << el2
-      end
-    end
-  end
 end