Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index c8770922d7b38b1547b6d3f49a05a8f0ab95c546..6770231790735b0ffc4e3f1957e5d4598de8e3df 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -19,6 +19,9 @@ class Node < ActiveRecord::Base
 
   has_many :node_tags, :foreign_key => :id
   
+  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