Simplify a number of object model methods

diff --git a/app/models/node.rb b/app/models/node.rb
index 9cac9839b3600b257a94a9feed25a0fcd7b54f00..12ffa20917c840c7eb172687a31265419a90cfde 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -196,13 +196,7 @@ class Node < ActiveRecord::Base
   end
 
   def tags
-    unless @tags
-      @tags = {}
-      self.node_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags
+    @tags ||= Hash[self.node_tags.collect { |t| [t.k, t.v] }]
   end
 
   def tags=(t)

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 3a0ecc367a5b98f7862bdc7fb91039102db6d431..90304acae4c1f9dadbaceaecc37475703648cbdd 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -80,14 +80,7 @@ class OldNode < ActiveRecord::Base
   end
 
   def tags
-    unless @tags
-      @tags = Hash.new
-      self.old_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
   end
 
   def tags=(t)

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 61c49eb590e803c2857248fd76df12ff92ea5a13..dc89afa50294ba35710123aa382243676f04c282 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -60,24 +60,13 @@ class OldRelation < ActiveRecord::Base
   end
 
   def members
-    unless @members
-      @members = Array.new
-      self.old_members.order(:sequence_id).each do |m|
-        @members += [[m.member_type,m.member_id,m.member_role]]
-      end
+    @members ||= self.old_members.collect do |member|
+      [member.member_type, member.member_id, member.member_role]
     end
-    @members
   end
 
   def tags
-    unless @tags
-      @tags = Hash.new
-      self.old_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
   end
 
   def members=(s)

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 408dd72c7e93dab73f0618c2b6849ad1721b5329..e5ba53852d76ee4fee03d83c08e6af50d2fa72d8 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -65,24 +65,11 @@ class OldWay < ActiveRecord::Base
   end
 
   def nds
-    unless @nds
-      @nds = Array.new
-      self.old_nodes.order(:sequence_id).each do |nd|
-        @nds += [nd.node_id]
-      end
-    end
-    @nds
+    @nds ||= self.old_nodes.order(:sequence_id).collect { |n| n.node_id }
   end
 
   def tags
-    unless @tags
-      @tags = Hash.new
-      self.old_tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
   end
 
   def nds=(s)

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 5207e98d8c766c1a9224f7a17b7c080ce0b60c38..4e423504939d294eda3a3a04a82276b81e34f72d 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -147,13 +147,7 @@ class Relation < ActiveRecord::Base
   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)

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)