Merge 7922:8377 from trunk.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index 37143ff00c5883a70daeed8717da9cbe25594776..4393f252679e12cf7a6c606ecd1331ad938228a2 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -10,23 +10,21 @@ class Node < GeoRecord
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 
+  belongs_to :user
+
   has_many :old_nodes, :foreign_key => :id
+
   has_many :way_nodes
-  belongs_to :user
- 
+  has_many :ways, :through => :way_nodes
+
+  has_many :containing_relation_members, :as => :member
+  has_many :containing_relations, :through => :containing_relation_members
+
   # Sanity check the latitude and longitude and add an error if it's broken
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?
   end
 
-  # Is this node withing -90 > latitude > 90 and -180 > longitude > 180>
-  # * returns true/false
-  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
   #