X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b8a7d956bfe177e5b576ba6cfc9cb8a7eff5ec83..64a5e21f53be132cd5fe3265230c6cdc00ccabaa:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 29b1d0b0a..7f9b939db 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,5 +1,6 @@
-class Node < GeoRecord
+class Node < ActiveRecord::Base
   require 'xml/libxml'
+  include GeoRecord
 
   set_table_name 'current_nodes'
   
@@ -12,17 +13,14 @@ class Node < GeoRecord
   has_many :way_nodes
   has_many :node_tags, :foreign_key => :id
   belongs_to :user
+  
+  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
  
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
-  def in_world?
-    return false if self.lat < -90 or self.lat > 90
-    return false if self.lon < -180 or self.lon > 180
-    return true
-  end
-
   #
   # Search for nodes matching tags within bounding_box
   #