overlay settings

pygeoapi/api/__init__.py

@@ -40,7 +40,7 @@
 Returns content from plugins and sets responses.
 """
 
-from collections import OrderedDict
+from collections import ChainMap, OrderedDict
 from copy import deepcopy
 from datetime import datetime
 from functools import partial
@@ -1604,16 +1604,11 @@ def evaluate_limit(requested: Union[None, int], server_limits: dict,
     :returns: `int` of evaluated limit
     """
 
-    if collection_limits:
-        LOGGER.debug('Using collection defined limit')
-        max_ = collection_limits.get('maxitems', 10)
-        default = collection_limits.get('defaultitems', 10)
-        on_exceed = collection_limits.get('on_exceed', 'throttle')
-    else:
-        LOGGER.debug('Using server defined limit')
-        max_ = server_limits.get('maxitems', 10)
-        default = server_limits.get('defaultitems', 10)
-        on_exceed = server_limits.get('on_exceed', 'throttle')
+    effective_limits = ChainMap(collection_limits, server_limits)
+
+    default = effective_limits.get('defaultitems', 10)
+    max_ = effective_limits.get('maxitems', 10)
+    on_exceed = effective_limits.get('on_exceed', 'throttle')
 
     LOGGER.debug(f'Requested limit: {requested}')
     LOGGER.debug(f'Default limit: {default}')

tests/api/test_api.py

@@ -881,3 +881,9 @@ def test_evaluate_limit():
 
     with pytest.raises(RuntimeError):
         assert evaluate_limit('40', server, collection) == 40
+
+    collection = {'defaultitems': 10}
+    server = {'defaultitems': 2, 'maxitems': 3}
+
+    assert evaluate_limit(None, server, collection) == 10
+    assert evaluate_limit('40', server, collection) == 3