X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/83167c368ec419789fa2e579de1af98e29abc30f..f8ad4c79a4c1880370a035be0c0286a9b4285a69:/app/controllers/api/maps_controller.rb diff --git a/app/controllers/api/maps_controller.rb b/app/controllers/api/maps_controller.rb index afba6faa4..439585462 100644 --- a/app/controllers/api/maps_controller.rb +++ b/app/controllers/api/maps_controller.rb @@ -54,26 +54,12 @@ module Api nodes += Node.includes(:node_tags).find(nodes_to_fetch) unless nodes_to_fetch.empty? - visible_nodes = {} - @nodes = [] - nodes.each do |node| - if node.visible? - visible_nodes[node.id] = node - @nodes << node - end - end + @nodes = nodes.filter(&:visible?) - @ways = [] - way_ids = [] - ways.each do |way| - if way.visible? - way_ids << way.id - @ways << way - end - end + @ways = ways.filter(&:visible?) - @relations = Relation.nodes(visible_nodes.keys).visible + - Relation.ways(way_ids).visible + @relations = Relation.nodes(@nodes).visible + + Relation.ways(@ways).visible # 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