Avoid reading nodes twice in WayController#full

[rails.git] / app / controllers / way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index c3ffe3c0f457f488c899c2fbd2f1bf67858e4f22..9f797d1d808202ae86f7a622ae3ebc1ab8775427 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -64,6 +64,7 @@ class WayController < ApplicationController
     way = Way.includes(:nodes => :node_tags).find(params[:id])
     
     if way.visible
+      visible_nodes = {}
       changeset_cache = {}
       user_display_name_cache = {}
 
@@ -71,9 +72,10 @@ class WayController < ApplicationController
       way.nodes.uniq.each do |node|
         if node.visible
           doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+          visible_nodes[node.id] = node
         end
       end
-      doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache)
+      doc.root << way.to_xml_node(visible_nodes, changeset_cache, user_display_name_cache)
       
       render :text => doc.to_s, :content_type => "text/xml"
     else