jsrouting: mouseover an instruction, highlight the route segment

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 5207e98d8c766c1a9224f7a17b7c080ce0b60c38..008f365c4a248d72b307c96d2725536a14c952d3 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -15,7 +15,7 @@ class Relation < ActiveRecord::Base
   has_many :relation_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
   has_many :relation_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 :timestamp,:version,  :changeset_id 
 
   validates_presence_of :id, :on => :update
   validates_presence_of :timestamp,:version,  :changeset_id 


@@ -147,13 +147,7 @@ class Relation < ActiveRecord::Base
   end
 
   def tags
   end
 
   def tags

-    unless @tags
-      @tags = Hash.new
-      self.relation_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags
+    @tags ||= Hash[self.relation_tags.collect { |t| [t.k, t.v] }]

   end
 
   def members=(m)
   end
 
   def members=(m)