X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b72fedb162d3fcecc304d7dfe5f67acb30844099..07c1cd6b983d5138c1a217a716248b9a1010b9e3:/app/models/node.rb diff --git a/app/models/node.rb b/app/models/node.rb index be444bf3e..af88a117d 100644 --- 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