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

[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 e8a27042d0f0e0a88fa46875d53bfc1c48dbe01d..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
+    before_action :check_api_readable
+
     authorize_resource :class => false
 
-    before_action :check_api_readable
     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
@@ -92,6 +95,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
   end