Include node coordinates on the data browser view for a node. Fixes #1856.

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

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index ec5674e94542487074ca29d986161762b357fea8..31871921949c6f4c9fb6985f54903d60a6a05648 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -3,6 +3,7 @@ class ApiController < ApplicationController
   session :off
   before_filter :check_api_readable, :except => [:capabilities]
   after_filter :compress_output
   session :off
   before_filter :check_api_readable, :except => [:capabilities]
   after_filter :compress_output

+  around_filter :api_call_handle_error, :api_call_timeout

 
   # Help methods for checking boundary sanity and area size
   include MapBoundary
 
   # Help methods for checking boundary sanity and area size
   include MapBoundary


@@ -262,6 +263,9 @@ class ApiController < ApplicationController
     changesets = XML::Node.new 'changesets'
     changesets['maximum_elements'] = Changeset::MAX_ELEMENTS.to_s
     api << changesets
     changesets = XML::Node.new 'changesets'
     changesets['maximum_elements'] = Changeset::MAX_ELEMENTS.to_s
     api << changesets

+    timeout = XML::Node.new 'timeout'
+    timeout['seconds'] = APP_CONFIG['api_timeout'].to_s
+    api << timeout

     
     doc.root << api
 
     
     doc.root << api