X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8ad1ce97983a5d4fb86ccb8ee4cd640a76f95255..e37c877da51947cb24af4d046fd71a597bf24ba9:/app/controllers/api/map_controller.rb?ds=sidebyside

diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb
index 4790e2f60..da8138597 100644
--- a/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@ -2,8 +2,7 @@ module Api
   class MapController < ApiController
     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
@@ -19,11 +18,13 @@ module Api
       # check boundary is sane and area within defined
       # see /config/application.yml
       begin
+        raise OSM::APIBadUserInput, "The parameter bbox is required" unless params[:bbox]
+
         @bounds = BoundingBox.from_bbox_params(params)
         @bounds.check_boundaries
         @bounds.check_size
-      rescue StandardError => err
-        report_error(err.message)
+      rescue StandardError => e
+        report_error(e.message)
         return
       end
 
@@ -92,6 +93,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
+        format.json
       end
     end
   end