X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cfbdd3f7e1c688e2c875ded9fd847fcc1c3a4caf..eeeb13e4e4d67600e02f949cdeec11277a1156db:/app/models/node.rb?ds=sidebyside

diff --git a/app/models/node.rb b/app/models/node.rb
index 7e78aaf59..9ed5c3bbf 100644
--- 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?
 
@@ -86,8 +87,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?