Treat an explicit public=0 argument as meaning private.

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

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index d413407541a51c9de9708b1d83b864f00e4a02d4..1f301e9fb168d805569d3d873ebb0c9a26d30a13 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,13 +1,13 @@
 class WayController < ApplicationController
   require 'xml/libxml'
 
-  session :off
   before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :require_allow_write_api, :only => [:create, :update, :delete]
   before_filter :require_public_data, :only => [:create, :update, :delete]
   before_filter :check_api_writable, :only => [:create, :update, :delete]
   before_filter :check_api_readable, :except => [:create, :update, :delete]
   after_filter :compress_output
-  around_filter :api_call_handle_error
+  around_filter :api_call_handle_error, :api_call_timeout
 
   def create
     assert_method :put
@@ -60,18 +60,19 @@ class WayController < ApplicationController
   end
 
   def full
-    way = Way.find(params[:id])
+    way = Way.find(params[:id], :include => {:nodes => :node_tags})
     
     if way.visible
-      nd_ids = way.nds + [-1]
-      nodes = Node.find(:all, :conditions => ["visible = ? AND id IN (#{nd_ids.join(',')})", true])
-      
-      # Render
+      changeset_cache = {}
+      user_display_name_cache = {}
+
       doc = OSM::API.new.get_xml_doc
-      nodes.each do |node|
-        doc.root << node.to_xml_node()
+      way.nodes.each do |node|
+        if node.visible
+          doc.root << node.to_xml_node(changeset_cache, user_display_name_cache)
+        end
       end
-      doc.root << way.to_xml_node()
+      doc.root << way.to_xml_node(nil, changeset_cache, user_display_name_cache)
       
       render :text => doc.to_s, :content_type => "text/xml"
     else