Merge pull request #5676 from tomhughes/spam-score-reports

[rails.git] / app / controllers / api / nodes / ways_controller.rb

diff --git a/app/controllers/api/nodes/ways_controller.rb b/app/controllers/api/nodes/ways_controller.rb
index 2a71f1903956e001d893487c8d635c7c47152e66..cdbdc07d0becd36fdd0311b00d6fdb832efa8ccc 100644 (file)
--- a/app/controllers/api/nodes/ways_controller.rb
+++ b/app/controllers/api/nodes/ways_controller.rb
@@ -10,9 +10,11 @@ module Api
       # :node_id parameter. note that this used to return deleted ways as well, but
       # this seemed not to be the expected behaviour, so it was removed.
       def index
       # :node_id parameter. note that this used to return deleted ways as well, but
       # this seemed not to be the expected behaviour, so it was removed.
       def index

-        way_ids = WayNode.where(:node_id => params[:node_id]).collect { |ws| ws.id[0] }.uniq
-
-        @ways = Way.where(:id => way_ids, :visible => true)
+        @ways = Way
+                .visible
+                .where(:id => WayNode.where(
+                  :node_id => params[:node_id]
+                ).select(:way_id))

 
         # Render the result
         respond_to do |format|
 
         # Render the result
         respond_to do |format|