clean up

Author: jonhealy1

stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/database_logic.py

@@ -187,7 +187,6 @@ async def get_all_collections(
         Returns:
             A tuple of (collections, next pagination token if any).
         """
-        # Format the sort parameter
         formatted_sort = []
         if sort:
             for item in sort:
@@ -199,18 +198,15 @@ async def get_all_collections(
             if not any("id" in item for item in formatted_sort):
                 formatted_sort.append({"id": {"order": "asc"}})
         else:
-            # Use a collections-specific default sort that doesn't rely on properties.datetime
             formatted_sort = [{"id": {"order": "asc"}}]
 
-        # Build the search body step by step to avoid type errors
         body = {
             "sort": formatted_sort,
             "size": limit,
         }
 
-        # Only add search_after if we have a token
         if token:
-            body["search_after"] = [token]  # search_after must be a list
+            body["search_after"] = [token]
 
         response = await self.client.search(
             index=COLLECTIONS_INDEX,
@@ -227,7 +223,6 @@ async def get_all_collections(
 
         next_token = None
         if len(hits) == limit:
-            # Ensure we have a valid sort value for next_token
             next_token_values = hits[-1].get("sort")
             if next_token_values:
                 next_token = next_token_values[0]

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -170,7 +170,6 @@ async def get_all_collections(
         Returns:
             A tuple of (collections, next pagination token if any).
         """
-        # Format the sort parameter
         formatted_sort = []
         if sort:
             for item in sort:
@@ -182,18 +181,15 @@ async def get_all_collections(
             if not any("id" in item for item in formatted_sort):
                 formatted_sort.append({"id": {"order": "asc"}})
         else:
-            # Use a collections-specific default sort that doesn't rely on properties.datetime
             formatted_sort = [{"id": {"order": "asc"}}]
 
-        # Build the search body step by step to avoid type errors
         body = {
             "sort": formatted_sort,
             "size": limit,
         }
 
-        # Only add search_after if we have a token
         if token:
-            body["search_after"] = [token]  # search_after must be a list
+            body["search_after"] = [token]
 
         response = await self.client.search(
             index=COLLECTIONS_INDEX,

stac_fastapi/sfeos_helpers/stac_fastapi/sfeos_helpers/mappings.py

@@ -160,17 +160,6 @@ class Geometry(Protocol):  # noqa
     "dynamic_templates": ES_MAPPINGS_DYNAMIC_TEMPLATES,
     "properties": {
         "id": {"type": "keyword"},
-        # "bbox_shape": {"type": "geo_shape"},  # Only this is used for spatial queries
-        # "extent": {
-        #     "properties": {"temporal": {"properties": {"interval": {"type": "date"}}}}
-        # },
-        # "properties": {
-        #     "properties": {
-        #         "datetime": {"type": "date"},
-        #         "start_datetime": {"type": "date"},
-        #         "end_datetime": {"type": "date"},
-        #     }
-        # },
         "extent.spatial.bbox": {"type": "long"},
         "extent.temporal.interval": {"type": "date"},
         "providers": {"type": "object", "enabled": False},