Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: stac server catalogs dates filtering #706

Merged
merged 1 commit into from
Apr 13, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 54 additions & 3 deletions eodag/rest/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import ast
import datetime
import logging
import os
import re
from collections import namedtuple
Expand All @@ -29,6 +30,8 @@
ValidationError,
)

logger = logging.getLogger("eodag.rest.utils")

eodag_api = eodag.EODataAccessGateway()
Cruncher = namedtuple("Cruncher", ["clazz", "config_params"])
crunchers = {
Expand Down Expand Up @@ -689,11 +692,59 @@ def search_stac_items(url, arguments, root="/", catalogs=[], provider=None):
arguments["dtstart"], arguments["dtend"] = dtime_split[0:1] * 2
arguments.pop("datetime")

search_products_arguments = dict(
arguments, **result_catalog.search_args, **{"unserialized": "true"}
)

# check if time filtering appears twice
if set(["dtstart", "dtend"]) <= set(arguments.keys()) and set(
["dtstart", "dtend"]
) <= set(result_catalog.search_args.keys()):
search_date_min = dateutil.parser.parse(arguments["dtstart"])
search_date_max = dateutil.parser.parse(arguments["dtend"])
catalog_date_min = dateutil.parser.parse(result_catalog.search_args["dtstart"])
catalog_date_max = dateutil.parser.parse(result_catalog.search_args["dtend"])
# check if date intervals overlap
if (search_date_min <= catalog_date_max) and (
search_date_max >= catalog_date_min
):
# use intersection
search_products_arguments["dtstart"] = (
max(search_date_min, catalog_date_min).isoformat().replace("+00:00", "")
+ "Z"
)
search_products_arguments["dtend"] = (
min(search_date_max, catalog_date_max).isoformat().replace("+00:00", "")
+ "Z"
)
else:
logger.warning("Time intervals do not overlap")
# return empty results
search_results = SearchResult([])
search_results.properties = {
"page": search_products_arguments.get("page", 1),
"itemsPerPage": search_products_arguments.get(
"itemsPerPage", DEFAULT_ITEMS_PER_PAGE
),
"totalResults": 0,
}
return StacItem(
url=url,
stac_config=stac_config,
provider=provider,
eodag_api=eodag_api,
root=root,
).get_stac_items(
search_results=search_results,
catalog=dict(
result_catalog.get_stac_catalog(),
**{"url": result_catalog.url, "root": result_catalog.root},
),
)

search_results = search_products(
product_type=result_catalog.search_args["product_type"],
arguments=dict(
arguments, **result_catalog.search_args, **{"unserialized": "true"}
),
arguments=search_products_arguments,
)

return StacItem(
Expand Down