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

[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 1b5150537bccb8299a990d4e0c47b20598a7df53..5a05f6de2b527e6c236b665007ab8a5cd309b534 100644 (file)
--- a/app/controllers/api/map_controller.rb
+++ b/app/controllers/api/map_controller.rb
@@ -1,8 +1,9 @@
 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
 
     before_action :set_request_formats
     around_action :api_call_handle_error, :api_call_timeout
 
     before_action :set_request_formats


@@ -21,6 +22,8 @@ module Api
       # check boundary is sane and area within defined
       # see /config/application.yml
       begin
       # 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
         @bounds = BoundingBox.from_bbox_params(params)
         @bounds.check_boundaries
         @bounds.check_size