refactor bbox handling

Author: Phil Varner

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py

@@ -50,9 +50,7 @@ class CoreClient(AsyncBaseCoreClient):
     async def all_collections(self, **kwargs) -> Collections:
         """Read all collections from the database."""
         base_url = str(kwargs["request"].base_url)
-        serialized_collections = await self.database.get_all_collections(
-            base_url=base_url
-        )
+        collection_list = await self.database.get_all_collections(base_url=base_url)
 
         links = [
             {
@@ -71,10 +69,8 @@ async def all_collections(self, **kwargs) -> Collections:
                 "href": urljoin(base_url, "collections"),
             },
         ]
-        collection_list = Collections(
-            collections=serialized_collections or [], links=links
-        )
-        return collection_list
+
+        return Collections(collections=collection_list, links=links)
 
     @overrides
     async def get_collection(self, collection_id: str, **kwargs) -> Collection:
@@ -91,22 +87,22 @@ async def item_collection(
         links = []
         base_url = str(kwargs["request"].base_url)
 
-        serialized_children, maybe_count = await self.database.get_collection_items(
+        items, maybe_count = await self.database.get_collection_items(
             collection_id=collection_id, limit=limit, base_url=base_url
         )
 
         context_obj = None
         if self.extension_is_enabled("ContextExtension"):
             context_obj = {
-                "returned": len(serialized_children),
+                "returned": len(items),
                 "limit": limit,
             }
             if maybe_count is not None:
                 context_obj["matched"] = maybe_count
 
         return ItemCollection(
             type="FeatureCollection",
-            features=serialized_children,
+            features=items,
             links=links,
             context=context_obj,
         )

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -144,9 +144,7 @@ def apply_bbox_filter(search: Search, bbox: List):
                         "geometry": {
                             "shape": {
                                 "type": "polygon",
-                                "coordinates": bbox2polygon(
-                                    bbox[0], bbox[1], bbox[2], bbox[3]
-                                ),
+                                "coordinates": bbox2polygon(*bbox),
                             },
                             "relation": "intersects",
                         }