From 7ab83f90dd5026a17e99dfee086dcd87ba7a1ef3 Mon Sep 17 00:00:00 2001 From: Gerald Walter Irsiegler Date: Mon, 22 Jan 2024 14:05:07 +0100 Subject: [PATCH 1/4] Fix: dimension names wrong if dimension is only 1 long, crs not being written in edge case. --- .../process_implementations/cubes/apply.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openeo_processes_dask/process_implementations/cubes/apply.py b/openeo_processes_dask/process_implementations/cubes/apply.py index f18db9f8..8fb372b1 100644 --- a/openeo_processes_dask/process_implementations/cubes/apply.py +++ b/openeo_processes_dask/process_implementations/cubes/apply.py @@ -78,8 +78,10 @@ def apply_dimension( {dimension: target_dimension} ) - if len(data[dimension]) == len(reordered_result[target_dimension]): - reordered_result.rio.write_crs(data.rio.crs, inplace=True) + if len(reordered_result[dimension]) == 1: + reordered_result[dimension] = ["0"] + + reordered_result.rio.write_crs(data.rio.crs, inplace=True) if is_new_dim_added: reordered_result.openeo.add_dim_type(name=target_dimension, type="other") From 1431e88b7c3dd5796c2ac6d24acdcd44a6886e0b Mon Sep 17 00:00:00 2001 From: Gerald Walter Irsiegler Date: Mon, 22 Jan 2024 14:09:51 +0100 Subject: [PATCH 2/4] Bump Version, add joblib dependency --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 19758826..ba5de7e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "openeo-processes-dask" -version = "2023.11.6" +version = "2024.1.1" description = "Python implementations of many OpenEO processes, dask-friendly by default." authors = ["Lukas Weidenholzer ", "Sean Hoyal ", "Valentina Hutter "] maintainers = ["EODC Staff "] @@ -39,6 +39,7 @@ pystac_client = { version = ">=0.6.1", optional = true } planetary_computer = { version = ">=0.5.1", optional = true } scipy = "^1.11.3" xvec = { version = ">=0.1.0", optional = true } +joblib = "^1.3.2" [tool.poetry.group.dev.dependencies] pytest = "^7.2.0" From 1a8e0f5bad8a750345496af8604e2af6429b0381 Mon Sep 17 00:00:00 2001 From: Gerald Walter Irsiegler Date: Mon, 22 Jan 2024 14:11:10 +0100 Subject: [PATCH 3/4] remove joblib dep --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ba5de7e9..544f20b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,7 +39,6 @@ pystac_client = { version = ">=0.6.1", optional = true } planetary_computer = { version = ">=0.5.1", optional = true } scipy = "^1.11.3" xvec = { version = ">=0.1.0", optional = true } -joblib = "^1.3.2" [tool.poetry.group.dev.dependencies] pytest = "^7.2.0" From 4c63d0b6d305ebd03cd378dfee376cd56f0d75a4 Mon Sep 17 00:00:00 2001 From: Gerald Walter Irsiegler Date: Mon, 22 Jan 2024 14:33:14 +0100 Subject: [PATCH 4/4] Fix: test cases --- .../process_implementations/cubes/apply.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/openeo_processes_dask/process_implementations/cubes/apply.py b/openeo_processes_dask/process_implementations/cubes/apply.py index 8fb372b1..aa425687 100644 --- a/openeo_processes_dask/process_implementations/cubes/apply.py +++ b/openeo_processes_dask/process_implementations/cubes/apply.py @@ -78,10 +78,14 @@ def apply_dimension( {dimension: target_dimension} ) - if len(reordered_result[dimension]) == 1: - reordered_result[dimension] = ["0"] - - reordered_result.rio.write_crs(data.rio.crs, inplace=True) + if len(reordered_result[target_dimension]) == 1: + reordered_result[target_dimension] = ["0"] + + if data.rio.crs is not None: + try: + reordered_result.rio.write_crs(data.rio.crs, inplace=True) + except ValueError: + pass if is_new_dim_added: reordered_result.openeo.add_dim_type(name=target_dimension, type="other")