set f= in next/prev links (#2175) (#2201)

Author: tomkralidis

pygeoapi/api/itemtypes.py

@@ -616,19 +616,26 @@ def get_collection_items(
         if offset > 0:
             prev_link = True
 
+    print(request.format)
     if prev_link:
         prev = max(0, offset - limit)
+        url = f'{uri}?offset={prev}{serialized_query_params}'
+        if request.format is not None:
+            url = f'{uri}?f={request.format}&offset={prev}{serialized_query_params}'  # noqa
+
         content['links'].append(
             {
                 'type': 'application/geo+json',
                 'rel': 'prev',
                 'title': l10n.translate('Items (prev)', request.locale),
-                'href': f'{uri}?offset={prev}{serialized_query_params}'
+                'href': url
             })
 
     if next_link:
         next_ = offset + limit
         next_href = f'{uri}?offset={next_}{serialized_query_params}'
+        if request.format is not None:
+            next_href = f'{uri}?f={request.format}&offset={next_}{serialized_query_params}'  # noqa
         content['links'].append(
             {
                 'type': 'application/geo+json',

tests/api/test_itemtypes.py

@@ -285,8 +285,7 @@ def test_get_collection_items(config, api_):
     assert '/collections/obs/items?f=csv&limit=1&bbox=-180,-90,180,90' \
         in links[3]['href']
     assert links[3]['rel'] == 'alternate'
-    assert '/collections/obs/items?offset=0&limit=1&bbox=-180,-90,180,90' \
-        in links[4]['href']
+    assert '/collections/obs/items?offset=0&limit=1&bbox=-180,-90,180,90' in links[4]['href']  # noqa
     assert links[4]['rel'] == 'prev'
     assert '/collections/obs' in links[5]['href']
     assert links[4]['rel'] == 'prev'