Merge pull request #18 from EO-DataHub/datetime_in_filter

Allow for datetime filters in filter extension

Author: hcollingwood

stac_planet_api/request_adaptor.py

@@ -41,8 +41,7 @@ def datetime_filter(date_filter: str):
     dt_filter = {
         "type": "DateRangeFilter",
         "field_name": "acquired",
-        "config": {
-        },
+        "config": {},
     }
 
     if start_date:
@@ -54,6 +53,27 @@ def datetime_filter(date_filter: str):
 
 
 def comparison_filter(comp_filter):
+    if comp_filter["args"][0]["property"] == "datetime":
+        dt_filter = {
+            "type": "DateRangeFilter",
+            "field_name": "acquired",
+            "config": {},
+        }
+
+        if comp_filter["op"] == ">":
+            dt_filter["config"]["gt"] = comp_filter["args"][1]
+
+        if comp_filter["op"] == ">=":
+            dt_filter["config"]["gte"] = comp_filter["args"][1]
+
+        if comp_filter["op"] == "<":
+            dt_filter["config"]["lt"] = comp_filter["args"][1]
+
+        if comp_filter["op"] == "<=":
+            dt_filter["config"]["lte"] = comp_filter["args"][1]
+
+        return dt_filter
+
     return {
         "type": "RangeFilter",
         "field_name": comp_filter["args"][0]["property"].lstrip("properties."),
@@ -69,7 +89,7 @@ def geometry_filter(geometry_filter):
         "field_name": geometry_filter["args"][0]["property"].lstrip("properties."),
         "config": {
             "type": "Polygon",
-            "coordinates": geometry_filter["args"][1]["coordinates"]
+            "coordinates": geometry_filter["args"][1]["coordinates"],
         },
     }
 
@@ -80,7 +100,9 @@ def convert_filter(stac_filter: dict):
         for sub_filter in stac_filter["args"]:
             config.append(convert_filter(sub_filter))
 
-        config = [c for c in config if c is not None]  # if there are any unrecognised filters then ignore them instead of erroring
+        config = [
+            c for c in config if c is not None
+        ]  # if there are any unrecognised filters then ignore them instead of erroring
         return {"type": f"{stac_filter['op'].title()}Filter", "config": config}
 
     elif stac_filter["op"] in ["<", ">", "<=", ">="]:
@@ -115,10 +137,7 @@ def build_search_filter(stac_request):
             {
                 "type": "GeometryFilter",
                 "field_name": "geometry",
-                "config": {
-                    "type": "Polygon",
-                    "coordinates": bbox_to_intersects(bbox)
-                },
+                "config": {"type": "Polygon", "coordinates": bbox_to_intersects(bbox)},
             }
         )