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

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

diff --git a/app/controllers/api/tracepoints_controller.rb b/app/controllers/api/tracepoints_controller.rb
index e758d559f99d0bb69eaeaca8ec7cecd8a1740862..f38351de96f0884e0a69aecebbb430871ad2c231 100644 (file)
--- a/app/controllers/api/tracepoints_controller.rb
+++ b/app/controllers/api/tracepoints_controller.rb
@@ -1,8 +1,9 @@
 module Api
   class TracepointsController < ApiController
 module Api
   class TracepointsController < ApiController

+    before_action :check_api_readable
+

     authorize_resource
 
     authorize_resource
 

-    before_action :check_api_readable

     around_action :api_call_handle_error, :api_call_timeout
 
     # Get an XML response containing a list of tracepoints that have been uploaded
     around_action :api_call_handle_error, :api_call_timeout
 
     # Get an XML response containing a list of tracepoints that have been uploaded


@@ -22,6 +23,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]
+

         bbox = BoundingBox.from_bbox_params(params)
         bbox.check_boundaries
         bbox.check_size
         bbox = BoundingBox.from_bbox_params(params)
         bbox.check_boundaries
         bbox.check_size