Merge remote-tracking branch 'upstream/pull/5064'

[rails.git] / app / controllers / api / maps_controller.rb

diff --git a/app/controllers/api/maps_controller.rb b/app/controllers/api/maps_controller.rb
index 9ba95c2551b650cfaccf0aa3c91f171a98e84238..439585462eba7e1e7f760183789eec960feffd12 100644 (file)
--- a/app/controllers/api/maps_controller.rb
+++ b/app/controllers/api/maps_controller.rb
@@ -46,10 +46,7 @@ module Api
         way_ids = way_nodes.collect { |way_node| way_node.id[0] }
         ways = Way.preload(:way_nodes, :way_tags).find(way_ids)
 
-        list_of_way_nodes = ways.collect do |way|
-          way.way_nodes.collect(&:node_id)
-        end
-        list_of_way_nodes.flatten!
+        list_of_way_nodes = ways.flat_map { |way| way.way_nodes.map(&:node_id) }
       end
 
       # - [0] in case some thing links to node 0 which doesn't exist. Shouldn't actually ever happen but it does. FIXME: file a ticket for this