Skip to content

Commit

Permalink
Revert "Update merge.py"
Browse files Browse the repository at this point in the history
This reverts commit fc5e90c.
  • Loading branch information
clausmichele committed Sep 29, 2023
1 parent 6f5616f commit 069affb
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions openeo_processes_dask/process_implementations/cubes/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,26 +100,27 @@ def merge_cubes(
previous_dim_order = list(cube1.dims) + [
dim for dim in cube2.dims if dim not in cube1.dims
]
band_dim1 = cube1.openeo.band_dims[0]
band_dim2 = cube2.openeo.band_dims[0]

if len(cube1.openeo.band_dims) > 0 or len(cube2.openeo.band_dims) > 0:
# Same reordering issue mentioned above
previous_band_order = list(cube1[band_dim1].values) + [
previous_band_order = list(
cube1[cube1.openeo.band_dims[0]].values
) + [
band
for band in list(cube2[cube2.openeo.band_dims[0]].values)
if band not in list(cube1[band_dim1].values)
if band not in list(cube1[cube1.openeo.band_dims[0]].values)
]
cube1 = cube1.to_dataset(band_dim1)
cube2 = cube2.to_dataset(band_dim2)
cube1 = cube1.to_dataset(cube1.openeo.band_dims[0])
cube2 = cube2.to_dataset(cube2.openeo.band_dims[0])

# compat="override" to deal with potentially conflicting coords
# see https://github.com/Open-EO/openeo-processes-dask/pull/148 for context
merged_cube = xr.combine_by_coords(
[cube1, cube2], combine_attrs="drop_conflicts", compat="override"
)
if isinstance(merged_cube, xr.Dataset):
merged_cube = merged_cube.to_array(dim=band_dim1)
merged_cube = merged_cube.reindex({band_dim1: previous_band_order})
merged_cube = merged_cube.to_array(dim="bands")
merged_cube = merged_cube.reindex({"bands": previous_band_order})

merged_cube = merged_cube.transpose(*previous_dim_order)

Expand Down

0 comments on commit 069affb

Please sign in to comment.