Skip to content

Commit

Permalink
Tonios comment addressed
Browse files Browse the repository at this point in the history
  • Loading branch information
konstntokas committed Jan 14, 2025
1 parent 63b17d1 commit c19319d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
6 changes: 5 additions & 1 deletion test/sampledata.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,11 @@ def new_5x5_dataset_regular_utm(cls):
spatial_ref = np.array(0)
band_1 = np.arange(25).reshape((5, 5))
ds = xr.Dataset(
dict(band_1=xr.DataArray(band_1, dims=("y", "x"))),
dict(
band_1=xr.DataArray(
band_1, dims=("y", "x"), attrs=dict(grid_mapping="spatial_ref")
)
),
coords=dict(x=x, y=y, spatial_ref=spatial_ref),
)
ds.spatial_ref.attrs = pyproj.CRS.from_epsg("32632").to_cf()
Expand Down
11 changes: 7 additions & 4 deletions xcube/core/resampling/spatial.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,18 @@ def resample_in_space(
# If CRSes are not both geographic and their CRSes are different
# transform the source_gm so its CRS matches the target CRS:
transformed_source_gm = source_gm.transform(target_gm.crs, xy_res=target_gm.xy_res)
transformed_x, transformed_y = transformed_source_gm.xy_coords
attrs = dict(grid_mapping="spatial_ref")
transformed_x.attrs = attrs
transformed_y.attrs = attrs
source_ds = source_ds.drop_vars(source_gm.xy_dim_names)
if "crs" in source_ds:
source_ds = source_ds.drop_vars("crs")
if "spatial_ref" in source_ds:
source_ds = source_ds.drop_vars("spatial_ref")
for var in source_ds.data_vars:
if "grid_mapping" in source_ds[var].attrs:
del source_ds[var].attrs["grid_mapping"]
transformed_x, transformed_y = transformed_source_gm.xy_coords
attrs = dict(grid_mapping="spatial_ref")
transformed_x.attrs = attrs
transformed_y.attrs = attrs
source_ds = source_ds.assign_coords(
spatial_ref=xr.DataArray(0, attrs=transformed_source_gm.crs.to_cf()),
transformed_x=transformed_x,
Expand Down

0 comments on commit c19319d

Please sign in to comment.