From ac8a24e79e4c7cfb94e8d13788f85311ec0bf293 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 7 Oct 2007 12:44:27 +0000 Subject: [PATCH 1/1] Cope with empty areas better. --- app/controllers/api_controller.rb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 2e693042e..cec8cf2bf 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -201,12 +201,17 @@ class ApiController < ApplicationController # collect relationships. currently done in one big block at the end; # may need to move this upwards if people want automatic completion of # relationships, i.e. deliver referenced objects like we do with ways... - relations = Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " + - "e.visible=1 and " + - "em.id = e.id and em.member_type='node' and em.member_id in (#{visible_nodes.keys.join(',')})") - relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " + - "e.visible=1 and " + - "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})") + relations = Array.new + if visible_nodes.length > 0 + relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " + + "e.visible=1 and " + + "em.id = e.id and em.member_type='node' and em.member_id in (#{visible_nodes.keys.join(',')})") + end + if way_ids.length > 0 + relations += Relation.find_by_sql("select e.* from current_relations e,current_relation_members em where " + + "e.visible=1 and " + + "em.id = e.id and em.member_type='way' and em.member_id in (#{way_ids.join(',')})") + end # we do not normally return the "other" partners referenced by an relation, # e.g. if we return a way A that is referenced by relation X, and there's # another way B also referenced, that is not returned. But we do make -- 2.43.2