cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changing the note search limit from 9999 to 10000

Browse source 
The documentation says the limit is 10000 which seems like a
nicer round number anyway.
This commit is contained in:
Toby Murray 2014-01-16 02:28:34 -06:00 • committed by Tom Hughes
parent 58381bbfd4
commit c78853a97e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/notes_controller.rb
View file

@ -309,10 +309,10 @@ private
# Get the maximum number of results to return
def result_limit
if params[:limit]
if params[:limit].to_i > 0 and params[:limit].to_i < 10000
if params[:limit].to_i > 0 and params[:limit].to_i <= 10000
params[:limit].to_i
else
raise OSM::APIBadUserInput.new("Note limit must be between 1 and 9999")
raise OSM::APIBadUserInput.new("Note limit must be between 1 and 10000")
end
else
100

6
test/functional/notes_controller_test.rb
View file

@ -632,7 +632,7 @@ class NotesControllerTest < ActionController::TestCase
get :index, {:bbox => '1,1,1.7,1.7', :limit => '0', :format => 'json'}
assert_response :bad_request
get :index, {:bbox => '1,1,1.7,1.7', :limit => '10000', :format => 'json'}
get :index, {:bbox => '1,1,1.7,1.7', :limit => '10001', :format => 'json'}
assert_response :bad_request
end
@ -709,7 +709,7 @@ class NotesControllerTest < ActionController::TestCase
get :search, {:q => 'no match', :limit => '0', :format => 'json'}
assert_response :bad_request
get :search, {:q => 'no match', :limit => '10000', :format => 'json'}
get :search, {:q => 'no match', :limit => '10001', :format => 'json'}
assert_response :bad_request
end
@ -743,7 +743,7 @@ class NotesControllerTest < ActionController::TestCase
get :feed, {:bbox => "1,1,1.2,1.2", :limit => '0', :format => "rss"}
assert_response :bad_request
get :feed, {:bbox => "1,1,1.2,1.2", :limit => '10000', :format => "rss"}
get :feed, {:bbox => "1,1,1.2,1.2", :limit => '10001', :format => "rss"}
assert_response :bad_request
end