Escape user display names.

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

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index d7a52c33617aaaedeaa4a0b1387555a8a701ac1c..2c3e93b2075fc5de263923694f50221123734ec1 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -1,4 +1,4 @@
-class OldNode < ActiveRecord::Base
+class OldNode < GeoRecord

   set_table_name 'nodes'
   
   validates_presence_of :user_id, :timestamp
   set_table_name 'nodes'
   
   validates_presence_of :user_id, :timestamp


@@ -7,14 +7,14 @@ class OldNode < ActiveRecord::Base
   validate :validate_position
 
   belongs_to :user
   validate :validate_position
 
   belongs_to :user

-
+ 

   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
   def in_world?
   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
 
     return true
   end
 


@@ -33,10 +33,17 @@ 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?
     el1['user'] = self.user.display_name if self.user.data_public?

-    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
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     return el1