X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9544ab12b8237b4e471f03df981a189c80216c63..15f0367e7fb8bf78059759414d7ec0d3dcceb42a:/app/models/way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index f9db684b8..1da048c96 100644
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -17,7 +17,7 @@ class Way < ActiveRecord::Base
   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
@@ -28,7 +28,7 @@ class Way < ActiveRecord::Base
   validates_associated :changeset
 
   scope :visible, -> { where(:visible => true) }
-    scope :invisible, -> { where(:visible => false) }
+  scope :invisible, -> { where(:visible => false) }
 
   # Read in xml as text and return it's Way object representation
   def self.from_xml(xml, create=false)
@@ -136,23 +136,11 @@ class Way < ActiveRecord::Base
   end 
 
   def nds
-    unless @nds
-      @nds = Array.new
-      self.way_nodes.each do |nd|
-        @nds += [nd.node_id]
-      end
-    end
-    @nds
+    @nds ||= self.way_nodes.collect { |n| n.node_id }
   end
 
   def tags
-    unless @tags
-      @tags = {}
-      self.way_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags
+    @tags ||= Hash[self.way_tags.collect { |t| [t.k, t.v] }]
   end
 
   def nds=(s)