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

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

diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb
index c783759bc6aef0ef625721ea0dee02e24ea1d5bc..0d123fc3e7851f2d0eae4748d4cacf38575e8e47 100644 (file)
--- a/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@ -1,10 +1,13 @@
 module Api
   class MapController < ApiController
 module Api
   class MapController < ApiController

+    before_action :check_api_readable
+

     authorize_resource :class => false
 
     authorize_resource :class => false
 

-    before_action :check_api_readable

     around_action :api_call_handle_error, :api_call_timeout
 
     around_action :api_call_handle_error, :api_call_timeout
 

+    before_action :set_request_formats
+

     # This is probably the most common call of all. It is used for getting the
     # OSM data for a specified bounding box, usually for editing. First the
     # bounding box (bbox) is checked to make sure that it is sane. All nodes
     # This is probably the most common call of all. It is used for getting the
     # OSM data for a specified bounding box, usually for editing. First the
     # bounding box (bbox) is checked to make sure that it is sane. All nodes


@@ -90,7 +93,10 @@ module Api
 
       response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
       # Render the result
 
       response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\""
       # Render the result

-      render formats: [:xml]
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
   end
 end
     end
   end
 end