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

[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 e8bd97b64196503f9d3279dd9e749496880cf38c..e45b5968c213d94917cc690fd160bf7ca11f9514 100644 (file)
--- a/app/controllers/api/tracepoints_controller.rb
+++ b/app/controllers/api/tracepoints_controller.rb
@@ -1,11 +1,7 @@
 module Api
   class TracepointsController < ApiController
 module Api
   class TracepointsController < ApiController

-    before_action :check_api_readable
-

     authorize_resource
 
     authorize_resource
 

-    around_action :api_call_handle_error, :api_call_timeout
-

     # Get an XML response containing a list of tracepoints that have been uploaded
     # within the specified bounding box, and in the specified page.
     def index
     # Get an XML response containing a list of tracepoints that have been uploaded
     # within the specified bounding box, and in the specified page.
     def index


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