add tests

Author: bitner

tests/routes/test_items.py

@@ -423,3 +423,62 @@ def test_items_datetime(app):
     )
     assert response.status_code == 422
     assert response.headers["content-type"] == "application/json"
+
+
+def test_items_geometry_return_options(app):
+    """Test /items endpoint with geometry return options."""
+    response = app.get("/collections/public.landsat_wrs/items?ids=1&geom-column=none")
+    assert response.status_code == 200
+    assert response.headers["content-type"] == "application/geo+json"
+    body = response.json()
+    assert len(body["features"]) == 1
+    assert body["numberMatched"] == 1
+    assert body["numberReturned"] == 1
+    assert body["features"][0]["id"] == "1"
+    assert body["features"][0]["properties"]["ogc_fid"] == 1
+    assert "geometry" not in body["features"][0]
+
+    response = app.get("/collections/public.landsat_wrs/items?ids=1&bbox-only=true")
+    assert response.status_code == 200
+    assert response.headers["content-type"] == "application/geo+json"
+    body = response.json()
+    assert len(body["features"]) == 1
+    assert body["numberMatched"] == 1
+    assert body["numberReturned"] == 1
+    assert body["features"][0]["id"] == "1"
+    assert body["features"][0]["properties"]["ogc_fid"] == 1
+    assert body["features"][0]["geometry"] == {
+        "coordinates": [
+            [
+                [-22.2153, 79.6888],
+                [-22.2153, 81.8555],
+                [-8.97407, 81.8555],
+                [-8.97407, 79.6888],
+                [-22.2153, 79.6888],
+            ]
+        ],
+        "type": "Polygon",
+    }
+
+    response = app.get("/collections/public.landsat_wrs/items?ids=1&simplify=.001")
+    assert response.status_code == 200
+    assert response.headers["content-type"] == "application/geo+json"
+    body = response.json()
+    assert len(body["features"]) == 1
+    assert body["numberMatched"] == 1
+    assert body["numberReturned"] == 1
+    assert body["features"][0]["id"] == "1"
+    assert body["features"][0]["properties"]["ogc_fid"] == 1
+    print(body["features"][0]["geometry"])
+    assert body["features"][0]["geometry"] == {
+        "coordinates": [
+            [
+                [-10.803, 80.989],
+                [-8.974, 80.342],
+                [-16.985, 79.689],
+                [-22.215, 81.092],
+                [-13.255, 81.856],
+                [-10.803, 80.989],
+            ]
+        ]
+    }

tifeatures/factory.py

@@ -401,7 +401,9 @@ def collection(
                         ),
                         model.Link(
                             href=self.url_for(
-                                request, "collection", collectionId=collection.id
+                                request,
+                                "collection",
+                                collectionId=collection.id,
                             )
                             + "?f=html",
                             rel="alternate",
@@ -530,7 +532,8 @@ async def items(
                 alias="bbox-only",
             ),
             simplify: Optional[float] = Query(
-                None, description="Simplify the output geometry."
+                None,
+                description="Simplify the output geometry to given threshold in decimal degrees.",
             ),
         ):
             offset = offset or 0

tifeatures/layer.py

@@ -198,7 +198,9 @@ def _where(
 
                 w.append(
                     logic.V(col.name)
-                    == logic.S(pg_funcs.cast(pg_funcs.cast(val, "text"), col.type))
+                    == logic.S(
+                        pg_funcs.cast(pg_funcs.cast(val, "text"), col.type)
+                    )
                 )
 
             if w:
@@ -224,9 +226,13 @@ def _where(
 
             datetime_column = self.datetime_column(dt)
             if not datetime_column:
-                raise InvalidDatetimeColumnName(f"Invalid Datetime Column: {dt}.")
+                raise InvalidDatetimeColumnName(
+                    f"Invalid Datetime Column: {dt}."
+                )
 
-            wheres.append(self._datetime_filter_to_sql(datetime, datetime_column.name))
+            wheres.append(
+                self._datetime_filter_to_sql(datetime, datetime_column.name)
+            )
 
         # `CQL` filter
         if cql is not None:
@@ -242,28 +248,42 @@ def _datetime_filter_to_sql(self, interval: List[str], dt_name: str):
 
         else:
             start = (
-                parse_rfc3339(interval[0]) if not interval[0] in ["..", ""] else None
+                parse_rfc3339(interval[0])
+                if not interval[0] in ["..", ""]
+                else None
+            )
+            end = (
+                parse_rfc3339(interval[1])
+                if not interval[1] in ["..", ""]
+                else None
             )
-            end = parse_rfc3339(interval[1]) if not interval[1] in ["..", ""] else None
 
             if start is None and end is None:
                 raise InvalidDatetime(
                     "Double open-ended datetime intervals are not allowed."
                 )
 
             if start is not None and end is not None and start > end:
-                raise InvalidDatetime("Start datetime cannot be before end datetime.")
+                raise InvalidDatetime(
+                    "Start datetime cannot be before end datetime."
+                )
 
             if not start:
-                return logic.V(dt_name) <= logic.S(pg_funcs.cast(end, "timestamptz"))
+                return logic.V(dt_name) <= logic.S(
+                    pg_funcs.cast(end, "timestamptz")
+                )
 
             elif not end:
-                return logic.V(dt_name) >= logic.S(pg_funcs.cast(start, "timestamptz"))
+                return logic.V(dt_name) >= logic.S(
+                    pg_funcs.cast(start, "timestamptz")
+                )
 
             else:
                 return pg_funcs.AND(
-                    logic.V(dt_name) >= logic.S(pg_funcs.cast(start, "timestamptz")),
-                    logic.V(dt_name) < logic.S(pg_funcs.cast(end, "timestamptz")),
+                    logic.V(dt_name)
+                    >= logic.S(pg_funcs.cast(start, "timestamptz")),
+                    logic.V(dt_name)
+                    < logic.S(pg_funcs.cast(end, "timestamptz")),
                 )
 
     def _features_query(
@@ -342,7 +362,9 @@ async def query(
     ) -> Tuple[FeatureCollection, int]:
         """Build and run Pg query."""
         if geom and geom.lower() != "none" and not self.geometry_column(geom):
-            raise InvalidGeometryColumnName(f"Invalid Geometry Column: {geom}.")
+            raise InvalidGeometryColumnName(
+                f"Invalid Geometry Column: {geom}."
+            )
 
         sql_query = """
             WITH
@@ -460,7 +482,9 @@ async def feature(
     def queryables(self) -> Dict:
         """Return the queryables."""
         geoms = {
-            col.name: {"$ref": geojson_schema.get(col.geometry_type.upper(), "")}
+            col.name: {
+                "$ref": geojson_schema.get(col.geometry_type.upper(), "")
+            }
             for col in self.geometry_columns
         }
         props = {