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

nicer fix I think for nil / [] issue

Browse source
This commit is contained in:
Steve Coast 2008-03-21 20:30:16 +00:00
parent 1f857565a6
commit ec264a935e
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/relation.rb
View file

@ -108,8 +108,8 @@ class Relation < ActiveRecord::Base
# relationships, i.e. deliver referenced objects like we do with ways... # relationships, i.e. deliver referenced objects like we do with ways...
# FIXME: rip out the fucking SQL # FIXME: rip out the fucking SQL
def self.find_for_nodes_and_ways(node_ids, way_ids) def self.find_for_nodes_and_ways(node_ids, way_ids)
return [] if node_ids.empty? and node_ids.empty? relations = []
relations = Array.new
if node_ids.length > 0 if node_ids.length > 0
relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " + relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " +
"e.visible=1 and " + "e.visible=1 and " +
@ -120,6 +120,8 @@ class Relation < ActiveRecord::Base
"e.visible=1 and " + "e.visible=1 and " +
"em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})") "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})")
end end
relations # if you don't do this then it returns nil and not []
end end