From 3f6e344e6ad6f8e75cd0be3d02492cfc322893e8 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sat, 19 Aug 2023 05:40:34 +0300 Subject: [PATCH] Expose note query limit values in api capabilities --- app/views/api/capabilities/show.builder | 2 ++ app/views/api/capabilities/show.json.jbuilder | 4 ++++ test/controllers/api/capabilities_controller_test.rb | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/app/views/api/capabilities/show.builder b/app/views/api/capabilities/show.builder index 1258601bb..bd90b2a6a 100644 --- a/app/views/api/capabilities/show.builder +++ b/app/views/api/capabilities/show.builder @@ -10,6 +10,8 @@ xml.osm(OSM::API.new.xml_root_attributes) do |osm| api.changesets(:maximum_elements => Changeset::MAX_ELEMENTS, :default_query_limit => Settings.default_changeset_query_limit, :maximum_query_limit => Settings.max_changeset_query_limit) + api.notes(:default_query_limit => Settings.default_note_query_limit, + :maximum_query_limit => Settings.max_note_query_limit) api.timeout(:seconds => Settings.api_timeout) api.status(:database => @database_status, :api => @api_status, diff --git a/app/views/api/capabilities/show.json.jbuilder b/app/views/api/capabilities/show.json.jbuilder index ceffa8b0e..b9e3a20c7 100644 --- a/app/views/api/capabilities/show.json.jbuilder +++ b/app/views/api/capabilities/show.json.jbuilder @@ -25,6 +25,10 @@ json.api do json.default_query_limit Settings.default_changeset_query_limit json.maximum_query_limit Settings.max_changeset_query_limit end + json.notes do + json.default_query_limit Settings.default_note_query_limit + json.maximum_query_limit Settings.max_note_query_limit + end json.timeout do json.seconds Settings.api_timeout end diff --git a/test/controllers/api/capabilities_controller_test.rb b/test/controllers/api/capabilities_controller_test.rb index 88c923201..46ebb6a37 100644 --- a/test/controllers/api/capabilities_controller_test.rb +++ b/test/controllers/api/capabilities_controller_test.rb @@ -37,6 +37,9 @@ module Api "[default_query_limit='#{Settings.default_changeset_query_limit}']" \ "[maximum_query_limit='#{Settings.max_changeset_query_limit}']", :count => 1 assert_select "relationmembers[maximum='#{Settings.max_number_of_relation_members}']", :count => 1 + assert_select "notes" \ + "[default_query_limit='#{Settings.default_note_query_limit}']" \ + "[maximum_query_limit='#{Settings.max_note_query_limit}']", :count => 1 assert_select "status[database='online']", :count => 1 assert_select "status[api='online']", :count => 1 assert_select "status[gpx='online']", :count => 1 @@ -61,6 +64,8 @@ module Api assert_equal Settings.default_changeset_query_limit, js["api"]["changesets"]["default_query_limit"] assert_equal Settings.max_changeset_query_limit, js["api"]["changesets"]["maximum_query_limit"] assert_equal Settings.max_number_of_relation_members, js["api"]["relationmembers"]["maximum"] + assert_equal Settings.default_note_query_limit, js["api"]["notes"]["default_query_limit"] + assert_equal Settings.max_note_query_limit, js["api"]["notes"]["maximum_query_limit"] assert_equal "online", js["api"]["status"]["database"] assert_equal "online", js["api"]["status"]["api"] assert_equal "online", js["api"]["status"]["gpx"] -- 2.39.5