Presentation work

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

diff --git a/app/models/way.rb b/app/models/way.rb
index f9db684b828854729024879d6de642d0369504cc..a9fdd88eeb1ca7f46714d42c3ec7cf8e61fe1344 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -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)