Merge branch 'main' into pr/cf-axis-units

Author: Zaczero

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ exclude: '^$'
 fail_fast: false
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: 'v0.14.14'
+  rev: 'v0.15.4'
   hooks:
   - id: ruff
 - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -13,7 +13,7 @@ repos:
     - id: check-yaml
       args: [--unsafe]
 - repo: https://github.com/PyCQA/bandit
-  rev: '1.9.3' # Update me!
+  rev: '1.9.4' # Update me!
   hooks:
     - id: bandit
       args: [--ini, .bandit]
@@ -32,7 +32,7 @@ repos:
         - pytest
       args: [ --warn-unused-configs ]
 - repo: https://github.com/pycqa/isort
-  rev: 7.0.0
+  rev: 8.0.1
   hooks:
     - id: isort
       language_version: python3

pyresample/future/geometry/_subset.py

@@ -100,7 +100,7 @@ def _get_area_boundary(area_to_cover: AreaDefinition) -> Boundary:
         if area_to_cover.is_geostationary:
             return Boundary(*get_geostationary_bounding_box_in_lonlats(area_to_cover))
         boundary_shape = max(max(*area_to_cover.shape) // 100 + 1, 3)
-        return area_to_cover.boundary(frequency=boundary_shape, force_clockwise=True)
+        return area_to_cover.boundary(vertices_per_side=boundary_shape, force_clockwise=True)
     except ValueError as err:
         raise NotImplementedError("Can't determine boundary of area to cover") from err
 

pyresample/slicer.py

@@ -170,7 +170,7 @@ def get_polygon_to_contain(self):
         from shapely.geometry import Polygon
 
         try:
-            x, y = self.area_to_contain.get_edge_bbox_in_projection_coordinates(frequency=10)
+            x, y = self.area_to_contain.get_edge_bbox_in_projection_coordinates(vertices_per_side=10)
         except AttributeError:
             x, y = self.area_to_contain.get_edge_lonlats(vertices_per_side=10)
         if self.area_to_crop.is_geostationary:
@@ -202,7 +202,7 @@ def get_slices_from_polygon(self, poly_to_contain):
         from shapely.geometry import Polygon
 
         poly_to_crop = Polygon(zip(
-            *self.area_to_crop.get_edge_bbox_in_projection_coordinates(frequency=10),
+            *self.area_to_crop.get_edge_bbox_in_projection_coordinates(vertices_per_side=10),
             strict=True))
         if not poly_to_crop.intersects(buffered_poly):
             raise IncompatibleAreas("Areas not overlapping.")

pyresample/test/test_geometry/test_area.py

@@ -1088,7 +1088,7 @@ def test_area_def_geocentric_resolution_latlong(self, create_test_area):
     def test_from_epsg(self, area_class):
         """Test the from_epsg class method."""
         sweref = area_class.from_epsg('3006', 2000)
-        assert sweref.description == 'SWEREF99 TM'
+        assert sweref.description in ['SWEREF99 TM', 'ETRS89-SWE [SWEREF 99 TM]']
         with ignore_pyproj_proj_warnings():
             assert sweref.proj_dict == {'ellps': 'GRS80', 'no_defs': None,
                                         'proj': 'utm', 'type': 'crs', 'units': 'm',

pyresample/test/test_utils/test_cf.py

@@ -142,6 +142,35 @@ def _prepare_cf_llnocrs():
     return ds
 
 
+def _prepare_cf_projected_packed_xy():
+    import xarray as xr
+
+    axis_values = np.array([-100, 0, 100], dtype=np.int16)
+    ds = xr.Dataset({'temp': (('y', 'x'), np.ma.masked_all((3, 3)), {'grid_mapping': 'crs'})},
+                    coords={'x': ('x', axis_values),
+                            'y': ('y', axis_values[::-1])})
+    ds['x'].attrs['standard_name'] = 'projection_x_coordinate'
+    ds['x'].attrs['units'] = 'm'
+    ds['x'].attrs['scale_factor'] = 10.0
+    ds['x'].attrs['add_offset'] = 1000.0
+    ds['y'].attrs['standard_name'] = 'projection_y_coordinate'
+    ds['y'].attrs['units'] = 'm'
+    ds['y'].attrs['scale_factor'] = 10.0
+    ds['y'].attrs['add_offset'] = 1000.0
+
+    ds['crs'] = 0
+    ds['crs'].attrs['grid_mapping_name'] = "stereographic"
+    ds['crs'].attrs['false_easting'] = 0.
+    ds['crs'].attrs['false_northing'] = 0.
+    ds['crs'].attrs['semi_major_axis'] = 6378137.
+    ds['crs'].attrs['inverse_flattening'] = 298.257223563
+    ds['crs'].attrs['latitude_of_projection_origin'] = 90.
+    ds['crs'].attrs['straight_vertical_longitude_from_pole'] = 0.
+    ds['crs'].attrs['scale_factor_at_projection_origin'] = 1.
+
+    return ds
+
+
 class TestLoadCFAreaPublic:
     """Test public API load_cf_area() for loading an AreaDefinition from netCDF/CF files."""
 
@@ -244,6 +273,7 @@ def test_load_cf_latlon(self, file_func, kwargs, exp_lat, exp_lon, future_geomet
         _validate_lonlat_cf_area(adef, cf_info, exp_lon, exp_lat)
         assert_future_geometry(adef, future_geometries)
 
+<<<<<<< pr/cf-axis-units
     def test_load_cf_axis_without_units(self):
         cf_file = _prepare_cf_nh10km()
         del cf_file['xc'].attrs['units']
@@ -264,6 +294,25 @@ def test_load_cf_axis_with_non_string_units(self):
         assert cf_info['x']['unit'] is None
         assert cf_info['y']['unit'] is None
 
+=======
+    def test_load_cf_dataset_input_decodes_cf_coordinates(self, tmp_path):
+        import xarray as xr
+
+        cf_file = _prepare_cf_projected_packed_xy()
+        file_path = tmp_path / "packed_xy.nc"
+        cf_file.to_netcdf(file_path)
+
+        expected_area, expected_info = load_cf_area(file_path, variable="temp")
+
+        with xr.open_dataset(file_path, decode_cf=False) as raw_ds:
+            area_from_dataset, info_from_dataset = load_cf_area(raw_ds, variable="temp")
+
+        np.testing.assert_allclose(area_from_dataset.area_extent, expected_area.area_extent)
+        assert info_from_dataset['x']['first'] == expected_info['x']['first']
+        assert info_from_dataset['x']['last'] == expected_info['x']['last']
+        assert info_from_dataset['y']['first'] == expected_info['y']['first']
+        assert info_from_dataset['y']['last'] == expected_info['y']['last']
+>>>>>>> main
 
 def _validate_lonlat_cf_area(adef, cf_info, exp_lon, exp_lat):
     assert adef.shape == (19, 37)

pyresample/utils/cf.py

@@ -472,6 +472,6 @@ def _open_nc_file(nc_file: str | Path | xr.Dataset) -> xr.Dataset:
     if xr is None:
         raise ImportError("Xarray (pip install xarray) is required to load geometries from a NetCDF file.")
     if isinstance(nc_file, xr.Dataset):
-        return nc_file
+        return xr.decode_cf(nc_file)
 
     return xr.open_dataset(nc_file)