cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify a number of object model methods

Browse source
This commit is contained in:
Tom Hughes 2013-12-05 00:50:04 +00:00
parent 1f52e5227f
commit 8c029f8d79
6 changed files with 11 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/node.rb
View file

@ -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)

9
app/models/old_node.rb
View file

@ -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)

17
app/models/old_relation.rb
View file

@ -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)

17
app/models/old_way.rb
View file

@ -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)

8
app/models/relation.rb
View file

@ -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)

18
app/models/way.rb
View file

@ -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)