Merge changes from trunk 7673:8632.

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

diff --git a/app/models/way.rb b/app/models/way.rb
index ea027fb47908d2148ae7d07476843972aeeebd86..34afc6585041e7fa3c723dc08bde40a8b24af83c 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -1,15 +1,19 @@
 class Way < ActiveRecord::Base
   require 'xml/libxml'
 
+  set_table_name 'current_ways'
+
   belongs_to :user
 
-  has_many :nodes, :through => :way_nodes, :order => 'sequence_id'
+  has_many :old_ways, :foreign_key => 'id', :order => 'version'
+
   has_many :way_nodes, :foreign_key => 'id', :order => 'sequence_id'
-  has_many :way_tags, :foreign_key => 'id'
+  has_many :nodes, :through => :way_nodes, :order => 'sequence_id'
 
-  has_many :old_ways, :foreign_key => 'id', :order => 'version'
+  has_many :way_tags, :foreign_key => 'id'
 
-  set_table_name 'current_ways'
+  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
 
   def self.from_xml(xml, create=false)
     begin
@@ -270,4 +274,9 @@ class Way < ActiveRecord::Base
     self.delete_with_history(user)
 
   end
+
+  # Temporary method to match interface to nodes
+  def tags_as_hash
+    return self.tags
+  end
 end