X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e7087af6bc0d7db9ca3f3c21be76e9c8a9c343b4..72dfc2e55e1334660bb0d5e5ad8fb65c50588fd6:/app/models/node.rb

diff --git a/app/models/node.rb b/app/models/node.rb
index 37143ff00..af88a117d 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,8 +1,8 @@
-# The node model represents a current existing node, that is, the latest version. Use OldNode for historical nodes.
-
-class Node < GeoRecord
+class Node < ActiveRecord::Base
   require 'xml/libxml'
 
+  include GeoRecord
+
   set_table_name 'current_nodes'
   
   validates_presence_of :user_id, :timestamp
@@ -10,23 +10,24 @@ 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 :old_way_nodes
+  has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
+
+  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
+
   # 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
   #
@@ -56,8 +57,7 @@ class Node < GeoRecord
   # Read in xml as text and return it's Node object representation
   def self.from_xml(xml, create=false)
     begin
-      p = XML::Parser.new
-      p.string = xml
+      p = XML::Parser.string(xml)
       doc = p.parse
   
       node = Node.new