small changes

Author: konstntokas

tests/test_utils.py

@@ -370,12 +370,12 @@ def test_resolution_meters_to_degrees(self):
         self.assertAlmostEqual(1.0, lon_deg, places=6)
 
         # 222640 m ≈ 2 degrees latitude
-        lat_deg, lon_deg = resolution_meters_to_degrees((222640, 111320), 0)
+        (lon_deg, lat_deg) = resolution_meters_to_degrees((111320, 222640), 0)
         self.assertAlmostEqual(2.0, lat_deg, places=6)
         self.assertAlmostEqual(1.0, lon_deg, places=6)
 
         # At 60 degrees latitude, longitude degrees shrink by cos(60°) = 0.5
-        lat_deg, lon_deg = resolution_meters_to_degrees(111320, 60)
+        (lon_deg, lat_deg) = resolution_meters_to_degrees(111320, 60)
         self.assertAlmostEqual(1.0, lat_deg, places=6)
         self.assertAlmostEqual(1.0 / 0.5, lon_deg, places=6)  # 2 degrees
 

xcube_resampling/gridmapping/coords.py

@@ -296,10 +296,12 @@ def new_grid_mapping_from_coords(
     x_res, y_res = _to_int_or_float(x_res), _to_int_or_float(y_res)
     if xy_bbox is None:
         x_res_05, y_res_05 = x_res / 2, y_res / 2
-        x_min = _to_int_or_float(x_coords[..., 0].min() - x_res_05)
-        x_max = _to_int_or_float(x_coords[..., -1].max() + x_res_05)
-        if x_max < x_min:
-            x_min, x_max = x_max, x_min
+        if np.any(x_coords[..., 0] > x_coords[..., -1]):
+            x_min = _to_int_or_float(x_coords[..., -1].min() + x_res_05)
+            x_max = _to_int_or_float(x_coords[..., 0].max() - x_res_05)
+        else:
+            x_min = _to_int_or_float(x_coords[..., 0].min() - x_res_05)
+            x_max = _to_int_or_float(x_coords[..., -1].max() + x_res_05)
         if is_j_axis_up:
             y_min = _to_int_or_float(float(y_coords[0, ...].min()) - y_res_05)
             y_max = _to_int_or_float(float(y_coords[-1, ...].max()) + y_res_05)

xcube_resampling/gridmapping/regular.py

@@ -193,8 +193,8 @@ def new_regular_grid_mapping_from_bbox(
     """
     if not isinstance(xy_res, tuple):
         xy_res = (xy_res, xy_res)
-    x_size = int(np.ceil((bbox[2] - bbox[0]) / xy_res[1]))
-    y_size = int(np.ceil(abs(bbox[3] - bbox[1]) / xy_res[0]))
+    x_size = int(np.ceil((bbox[2] - bbox[0]) / xy_res[0]))
+    y_size = int(np.ceil(abs(bbox[3] - bbox[1]) / xy_res[1]))
     return new_regular_grid_mapping(
         size=(x_size, y_size),
         xy_min=(bbox[0], bbox[1]),

xcube_resampling/utils.py

@@ -299,8 +299,8 @@ def resolution_meters_to_degrees(
     if not isinstance(resolution, tuple):
         resolution = (resolution, resolution)
     return (
-        resolution[0] / 111320,
-        resolution[1] / (111320 * np.cos(np.deg2rad(latitude))),
+        resolution[0] / (111320 * np.cos(np.deg2rad(latitude))),
+        resolution[1] / 111320,
     )