Merge pull request #39 from developmentseed/numbermatched

Numbermatched Fix

Author: vincentsarago

tests/routes/test_items.py

@@ -64,14 +64,13 @@ def test_items_limit_and_offset(app):
     assert body["numberReturned"] == 1
     assert ["collection", "self", "prev"] == [link["rel"] for link in body["links"]]
 
-    # TODO: Fix
-    # offset > data
-    # response = app.get("/collections/public.landsat_wrs/items?offset=20000")
-    # assert response.status_code == 200
-    # body = response.json()
-    # assert len(body["features"]) == 0
-    # assert body["numberMatched"] == 16269
-    # assert body["numberReturned"] == 0
+    # offset overflow, return empty feature collection
+    response = app.get("/collections/public.landsat_wrs/items?offset=20000")
+    assert response.status_code == 200
+    body = response.json()
+    assert len(body["features"]) == 0
+    assert body["numberMatched"] == 16269
+    assert body["numberReturned"] == 0
 
 
 def test_items_bbox(app):

tifeatures/layer.py

@@ -376,18 +376,25 @@ async def query(
                 )
             SELECT json_build_object(
                 'type', 'FeatureCollection',
-                'features', json_agg(
-                    json_build_object(
-                        'type', 'Feature',
-                        'id', :id_column,
-                        'geometry', :geometry_q,
-                        'properties', to_jsonb( features.* ) - :geom_columns::text[]
+                'features',
+                    (
+                        SELECT
+                            json_agg(
+                                json_build_object(
+                                    'type', 'Feature',
+                                    'id', :id_column,
+                                    'geometry', :geometry_q,
+                                    'properties', to_jsonb( features.* ) - :geom_columns::text[]
+                                )
+                            )
+                        FROM features
+                    ),
+                'total_count',
+                    (
+                        SELECT count FROM total_count
                     )
-                ),
-                'total_count', total_count.count
-            )
-            FROM features, total_count
-            GROUP BY total_count.count;
+                )
+            ;
         """
         q, p = render(
             sql_query,
@@ -424,13 +431,10 @@ async def query(
         async with pool.acquire() as conn:
             items = await conn.fetchval(q, *p)
 
-        if items:
-            return (
-                FeatureCollection(features=items["features"]),
-                items["total_count"],
-            )
-        else:
-            return FeatureCollection(features=[]), 0
+        return (
+            FeatureCollection(features=items.get("features") or []),
+            items["total_count"],
+        )
 
     async def features(
         self,