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

[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 4790e2f60992bb08a9b3261c8c8ef66a0abbf7ff..da8138597ae7b269fbb983a7eda8a4347c8a9ae7 100644 (file)
--- 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
 
   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
 
     # 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
       # 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

-      rescue StandardError => err
-        report_error(err.message)
+      rescue StandardError => e
+        report_error(e.message)

         return
       end
 
         return
       end
 


@@ -92,6 +93,7 @@ module Api
       # Render the result
       respond_to do |format|
         format.xml
       # Render the result
       respond_to do |format|
         format.xml

+        format.json

       end
     end
   end
       end
     end
   end