From 7b33232677e501b85ad44adf3111cf547b2bc107 Mon Sep 17 00:00:00 2001 From: rhysrevans3 Date: Fri, 5 Jan 2024 15:12:47 +0000 Subject: [PATCH] Removing _return_date bounding constants. --- .../stac_fastapi/elasticsearch/core.py | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py index 4fb9f174..4f4d5ce2 100644 --- a/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py +++ b/stac_fastapi/elasticsearch/stac_fastapi/elasticsearch/core.py @@ -289,22 +289,10 @@ def _return_date(interval_str): datetime = f"{intervals[0][0:19]}Z" return {"eq": datetime} else: - start_date = intervals[0] - end_date = intervals[1] - if ".." not in intervals: - start_date = f"{start_date[0:19]}Z" - end_date = f"{end_date[0:19]}Z" - elif start_date != "..": - start_date = f"{start_date[0:19]}Z" - end_date = "2200-12-01T12:31:12Z" - elif end_date != "..": - start_date = "1900-10-01T00:00:00Z" - end_date = f"{end_date[0:19]}Z" - else: - start_date = "1900-10-01T00:00:00Z" - end_date = "2200-12-01T12:31:12Z" + start_date = f"{intervals[0][0:19]}Z" if intervals[0] != ".." else None + end_date = f"{intervals[1][0:19]}Z" if intervals[1] != ".." else None - return {"lte": end_date, "gte": start_date} + return {"lte": end_date, "gte": start_date} async def get_search( self, @@ -457,9 +445,9 @@ async def post_search( ) if search_request.query: - for (field_name, expr) in search_request.query.items(): + for field_name, expr in search_request.query.items(): field = "properties__" + field_name - for (op, value) in expr.items(): + for op, value in expr.items(): search = self.database.apply_stacql_filter( search=search, op=op, field=field, value=value )