first commit

Author: Yuri Zmytrakov

stac_fastapi/opensearch/stac_fastapi/opensearch/database_logic.py

@@ -5,6 +5,7 @@
 from base64 import urlsafe_b64decode, urlsafe_b64encode
 from collections.abc import Iterable
 from copy import deepcopy
+from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Tuple, Type
 
 import attr
@@ -74,6 +75,36 @@
 logger = logging.getLogger(__name__)
 
 
+@dataclass
+class GeoShapeNode:
+    geometry: "GeometryNode"
+
+
+@dataclass
+class GeometryNode:
+    shape: "ShapeNode"
+    relation: str
+
+
+@dataclass
+class ShapeNode:
+    type: str
+    coordinates: List[List[List[float]]]
+
+
+def analyze_bbox_query(node) -> dict:
+    """Analyze and build bbox query"""
+    if isinstance(node, GeoShapeNode):
+        return analyze_bbox_query(node.geometry)
+    elif isinstance(node, GeometryNode):
+        shape_filter = analyze_bbox_query(node.shape)
+        return {"shape": shape_filter, "relation": node.relation}
+    elif isinstance(node, ShapeNode):
+        if node.type == "polygon":
+            return {"type": node.type, "coordinates": node.coordinates}
+    return {}
+
+
 async def create_index_templates() -> None:
     """
     Create index templates for the Collection and Item indices.
@@ -595,34 +626,15 @@ def apply_datetime_filter(
 
     @staticmethod
     def apply_bbox_filter(search: Search, bbox: List):
-        """Filter search results based on bounding box.
+        """Filter search results based on bounding box using AST analysis pattern."""
+        polygon_coordinates = bbox2polygon(*bbox)
 
-        Args:
-            search (Search): The search object to apply the filter to.
-            bbox (List): The bounding box coordinates, represented as a list of four values [minx, miny, maxx, maxy].
-
-        Returns:
-            search (Search): The search object with the bounding box filter applied.
+        shape_node = ShapeNode(type="polygon", coordinates=polygon_coordinates)
+        geometry_node = GeometryNode(shape=shape_node, relation="intersects")
+        geo_shape_node = GeoShapeNode(geometry=geometry_node)
 
-        Notes:
-            The bounding box is transformed into a polygon using the `bbox2polygon` function and
-            a geo_shape filter is added to the search object, set to intersect with the specified polygon.
-        """
-        return search.filter(
-            Q(
-                {
-                    "geo_shape": {
-                        "geometry": {
-                            "shape": {
-                                "type": "polygon",
-                                "coordinates": bbox2polygon(*bbox),
-                            },
-                            "relation": "intersects",
-                        }
-                    }
-                }
-            )
-        )
+        bbox_query_dict = analyze_bbox_query(geo_shape_node)
+        return search.filter(Q("geo_shape", geometry=bbox_query_dict))
 
     @staticmethod
     def apply_intersects_filter(