From db383d92cc68c0d6cffd662e666397898b3b7568 Mon Sep 17 00:00:00 2001 From: abradley60 Date: Mon, 22 Jul 2024 13:46:57 +0930 Subject: [PATCH 1/3] changes for indexing new sentinel-2 collection in deafrica odc --- apps/dc_tools/odc/apps/dc_tools/_stac.py | 12 ++++++++++-- apps/dc_tools/odc/apps/dc_tools/_version.py | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/dc_tools/odc/apps/dc_tools/_stac.py b/apps/dc_tools/odc/apps/dc_tools/_stac.py index 6793c9544..bdc78c600 100644 --- a/apps/dc_tools/odc/apps/dc_tools/_stac.py +++ b/apps/dc_tools/odc/apps/dc_tools/_stac.py @@ -29,6 +29,7 @@ "sentinel_s2_l2a_cogs", "sentinel-s2-l2a-cogs", "sentinel-2-l2a", + "s2_l2a_c1" ] # Mapping between EO3 field names and STAC properties object field names @@ -118,7 +119,10 @@ def _stac_product_lookup( dataset_id = properties.get("sentinel:product_id") or properties.get( "s2:granule_id", dataset_id ) - product_name = "s2_l2a" + if collection == "s2_l2a_c1": + product_name = "s2_l2a_c1" + else: + product_name = "s2_l2a" if region_code is None: # Let's try two options, and throw an exception if we still don't get it try: @@ -182,7 +186,11 @@ def _find_self_href(item: Document) -> str: def _get_relative_path(asset_href, self_link): if self_link is None: return asset_href - + elif urlparse(self_link).netloc != urlparse(asset_href).netloc: + # files are not stored in same domain (e.g. diferent buckets) + # therefore use the absolute path + return asset_href + self_path = urlparse(self_link).path href_path = urlparse(asset_href).path diff --git a/apps/dc_tools/odc/apps/dc_tools/_version.py b/apps/dc_tools/odc/apps/dc_tools/_version.py index aa0be2139..927de2582 100644 --- a/apps/dc_tools/odc/apps/dc_tools/_version.py +++ b/apps/dc_tools/odc/apps/dc_tools/_version.py @@ -1 +1 @@ -__version__ = "0.2.17" +__version__ = "0.2.18" From be1ab85280054af7885dbe9bd8c50373eca0cc26 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 04:49:49 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- apps/dc_tools/odc/apps/dc_tools/_stac.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dc_tools/odc/apps/dc_tools/_stac.py b/apps/dc_tools/odc/apps/dc_tools/_stac.py index bdc78c600..566db7d5b 100644 --- a/apps/dc_tools/odc/apps/dc_tools/_stac.py +++ b/apps/dc_tools/odc/apps/dc_tools/_stac.py @@ -29,7 +29,7 @@ "sentinel_s2_l2a_cogs", "sentinel-s2-l2a-cogs", "sentinel-2-l2a", - "s2_l2a_c1" + "s2_l2a_c1", ] # Mapping between EO3 field names and STAC properties object field names @@ -190,7 +190,7 @@ def _get_relative_path(asset_href, self_link): # files are not stored in same domain (e.g. diferent buckets) # therefore use the absolute path return asset_href - + self_path = urlparse(self_link).path href_path = urlparse(asset_href).path From d1b5dc9427782f23840810e3bfeaaf623974159d Mon Sep 17 00:00:00 2001 From: abradley60 Date: Mon, 22 Jul 2024 14:25:15 +0930 Subject: [PATCH 3/3] formatting --- apps/dc_tools/odc/apps/dc_tools/_stac.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dc_tools/odc/apps/dc_tools/_stac.py b/apps/dc_tools/odc/apps/dc_tools/_stac.py index bdc78c600..566db7d5b 100644 --- a/apps/dc_tools/odc/apps/dc_tools/_stac.py +++ b/apps/dc_tools/odc/apps/dc_tools/_stac.py @@ -29,7 +29,7 @@ "sentinel_s2_l2a_cogs", "sentinel-s2-l2a-cogs", "sentinel-2-l2a", - "s2_l2a_c1" + "s2_l2a_c1", ] # Mapping between EO3 field names and STAC properties object field names @@ -190,7 +190,7 @@ def _get_relative_path(asset_href, self_link): # files are not stored in same domain (e.g. diferent buckets) # therefore use the absolute path return asset_href - + self_path = urlparse(self_link).path href_path = urlparse(asset_href).path