fix CSV provider paging (#1703) (#1710)

* fix CSV provider paging (#1703)

* update tests

Author: tomkralidis

pygeoapi/provider/csv_.py

@@ -130,7 +130,7 @@ def _load(self, offset=0, limit=10, resulttype='results',
                 feature_collection['numberMatched'] = len(list(data_))
                 return feature_collection
             LOGGER.debug('Slicing CSV rows')
-            for row in itertools.islice(data_, offset, offset+limit):
+            for row in itertools.islice(data_, 0, None):
                 try:
                     coordinates = [
                         float(row.pop(self.geometry_x)),
@@ -178,6 +178,9 @@ def _load(self, offset=0, limit=10, resulttype='results',
         elif identifier is not None and found:
             return result
 
+        features_returned = feature_collection['features'][offset:offset+limit]
+        feature_collection['features'] = features_returned
+
         feature_collection['numberReturned'] = len(
             feature_collection['features'])
 

tests/api/test_itemtypes.py

@@ -194,15 +194,16 @@ def test_get_collection_items(config, api_):
     assert features['features'][1]['properties']['stn_id'] == 35
 
     links = features['links']
-    assert len(links) == 4
+    assert len(links) == 5
     assert '/collections/obs/items?f=json' in links[0]['href']
     assert links[0]['rel'] == 'self'
     assert '/collections/obs/items?f=jsonld' in links[1]['href']
     assert links[1]['rel'] == 'alternate'
     assert '/collections/obs/items?f=html' in links[2]['href']
     assert links[2]['rel'] == 'alternate'
     assert '/collections/obs' in links[3]['href']
-    assert links[3]['rel'] == 'collection'
+    assert links[3]['rel'] == 'next'
+    assert links[4]['rel'] == 'collection'
 
     # Invalid offset
     req = mock_api_request({'offset': -1})
@@ -242,7 +243,7 @@ def test_get_collection_items(config, api_):
     assert len(features['features']) == 1
 
     links = features['links']
-    assert len(links) == 5
+    assert len(links) == 6
     assert '/collections/obs/items?f=json&limit=1&bbox=-180,90,180,90' in \
         links[0]['href']
     assert links[0]['rel'] == 'self'
@@ -256,7 +257,9 @@ def test_get_collection_items(config, api_):
         in links[3]['href']
     assert links[3]['rel'] == 'prev'
     assert '/collections/obs' in links[4]['href']
-    assert links[4]['rel'] == 'collection'
+    assert links[3]['rel'] == 'prev'
+    assert links[4]['rel'] == 'next'
+    assert links[5]['rel'] == 'collection'
 
     req = mock_api_request({
         'sortby': 'bad-property',

tests/test_csv__provider.py

@@ -137,7 +137,7 @@ def test_get_station(station_config):
 
     results = p.query(limit=20)
     assert len(results['features']) == 20
-    assert results['numberMatched'] == 20
+    assert results['numberMatched'] == 79
     assert results['numberReturned'] == 20
 
     result = p.get('0-20000-0-16337')