fixed tests

Author: forman

test/core/resampling/test_affine.py

@@ -46,7 +46,7 @@ class AffineTransformDatasetTest(unittest.TestCase):
     def test_subset(self):
         target_gm = GridMapping.regular((3, 3), (50.0, 10.0), res, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(
@@ -66,7 +66,7 @@ def test_subset(self):
 
         target_gm = GridMapping.regular((3, 3), (50.1, 10.1), res, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(
@@ -86,7 +86,7 @@ def test_subset(self):
 
         target_gm = GridMapping.regular((3, 3), (50.05, 10.05), res, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(
@@ -102,13 +102,15 @@ def test_different_geographic_crses(self):
         expected = np.array([[1.25, 1.5, 0.75], [1.0, 1.25, 1.5], [1.75, 1.0, 1.25]])
 
         target_gm = GridMapping.regular((3, 3), (50.05, 10.05), res, CRS_WGS84)
-        target_ds = affine_transform_dataset(source_ds, source_gm, target_gm)
+        target_ds = affine_transform_dataset(
+            source_ds, source_gm=source_gm, target_gm=target_gm
+        )
         self.assertEqual((3, 3), target_ds.refl.shape)
         np.testing.assert_almost_equal(target_ds.refl.values, expected)
 
         target_gm = GridMapping.regular((3, 3), (50.05, 10.05), res, CRS_CRS84)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertEqual((3, 3), target_ds.refl.shape)
         np.testing.assert_almost_equal(target_ds.refl.values, expected)
@@ -122,12 +124,14 @@ def test_different_geographic_crses(self):
             ' must be equal, was "WGS 84" and'
             ' "ETRS89-extended / LAEA Europe"',
         ):
-            affine_transform_dataset(source_ds, source_gm, target_gm)
+            affine_transform_dataset(
+                source_ds, source_gm=source_gm, target_gm=target_gm
+            )
 
     def test_downscale_x2(self):
         target_gm = GridMapping.regular((8, 6), (50, 10), 2 * res, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(
@@ -152,7 +156,7 @@ def test_downscale_x2(self):
     def test_downscale_x2_and_shift(self):
         target_gm = GridMapping.regular((8, 6), (49.8, 9.8), 2 * res, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(
@@ -177,7 +181,7 @@ def test_downscale_x2_and_shift(self):
     def test_upscale_x2(self):
         target_gm = GridMapping.regular((8, 6), (50, 10), res / 2, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(
@@ -202,7 +206,7 @@ def test_upscale_x2(self):
     def test_upscale_x2_and_shift(self):
         target_gm = GridMapping.regular((8, 6), (49.9, 9.95), res / 2, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(
@@ -227,7 +231,7 @@ def test_upscale_x2_and_shift(self):
     def test_shift(self):
         target_gm = GridMapping.regular((8, 6), (50.2, 10.1), res, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(
@@ -251,7 +255,7 @@ def test_shift(self):
 
         target_gm = GridMapping.regular((8, 6), (49.8, 9.9), res, source_gm.crs)
         target_ds = affine_transform_dataset(
-            source_ds, source_gm, target_gm, gm_name="crs"
+            source_ds, source_gm=source_gm, target_gm=target_gm, gm_name="crs"
         )
         self.assertIsInstance(target_ds, xr.Dataset)
         self.assertEqual(

test/core/resampling/test_spatial.py

@@ -25,7 +25,11 @@ def test_affine_transform_dataset(self):
         )
 
         target_ds = resample_in_space(
-            source_ds, source_gm, target_gm, encode_cf=True, gm_name="crs"
+            source_ds,
+            source_gm=source_gm,
+            target_gm=target_gm,
+            encode_cf=True,
+            gm_name="crs",
         )
 
         self.assertIn("crs", target_ds)

xcube/core/resampling/affine.py

@@ -110,7 +110,7 @@ def affine_transform_dataset(
         resampled_dataset.assign_coords(new_coords),
         target_gm,
         gm_name,
-        target_ds,
+        target_ds.coords if target_ds else None,
     )
 
 

xcube/core/resampling/rectify.py

@@ -201,7 +201,7 @@ def rectify_dataset(
         xr.Dataset(dst_vars, coords=dst_ds_coords, attrs=src_attrs),
         target_gm,
         gm_name,
-        target_ds,
+        target_ds.coords if target_ds else None,
     )