X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b5f06e06c14f440d3c014b348149fe9ec1b67657..225b260640a0c17f3ae408c70987618ceb07fa0d:/app/controllers/api/notes_controller.rb diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb index 8a41d5db8..d915d8126 100644 --- a/app/controllers/api/notes_controller.rb +++ b/app/controllers/api/notes_controller.rb @@ -1,14 +1,15 @@ module Api class NotesController < ApiController before_action :check_api_readable - before_action :setup_user_auth, :only => [:create, :comment, :show] + before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy] + before_action :setup_user_auth, :only => [:create, :show] before_action :authorize, :only => [:close, :reopen, :destroy, :comment] authorize_resource - before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy] before_action :set_locale around_action :api_call_handle_error, :api_call_timeout + before_action :set_request_formats, :except => [:feed] ## # Return a list of notes in a given area @@ -34,6 +35,10 @@ module Api # Check the the bounding box is not too big bbox.check_size(Settings.max_note_request_area) + @min_lon = bbox.min_lon + @min_lat = bbox.min_lat + @max_lon = bbox.max_lon + @max_lat = bbox.max_lat # Find the notes we want to return @notes = notes.bbox(bbox).order("updated_at DESC").limit(result_limit).preload(:comments) @@ -189,6 +194,10 @@ module Api bbox.check_size(Settings.max_note_request_area) notes = notes.bbox(bbox) + @min_lon = bbox.min_lon + @min_lat = bbox.min_lat + @max_lon = bbox.max_lon + @max_lat = bbox.max_lat end # Find the comments we want to return