Merge pull request #35 from tomhughes/routing

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

diff --git a/app/models/way.rb b/app/models/way.rb
index a9fdd88eeb1ca7f46714d42c3ec7cf8e61fe1344..e78d0df0b048b2143cf8038ed7027c0f711bcf31 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -12,12 +12,12 @@ class Way < ActiveRecord::Base
   has_many :old_ways, -> { order(:version) }
 
   has_many :way_nodes, -> { order(:sequence_id) }
   has_many :old_ways, -> { order(:version) }
 
   has_many :way_nodes, -> { order(:sequence_id) }

-  has_many :nodes, -> { order("sequence_id") }, :through => :way_nodes
+  has_many :nodes, :through => :way_nodes

 
   has_many :way_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
 
   has_many :way_tags
 
   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
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation

 
   validates_presence_of :id, :on => :update
   validates_presence_of :changeset_id,:version,  :timestamp
 
   validates_presence_of :id, :on => :update
   validates_presence_of :changeset_id,:version,  :timestamp