Update to use libxml 1.0.0 gem.

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

diff --git a/app/models/node.rb b/app/models/node.rb
index be444bf3e252fee4832ea12e8c31dfa4124d9742..af88a117d83879ef0eb21d438a11d211cb670dc7 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -17,8 +17,11 @@ class Node < ActiveRecord::Base
   has_many :way_nodes
   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
+  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
@@ -54,8 +57,7 @@ class Node < ActiveRecord::Base
   # 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