upgrade_shapely_2.0_fix (#731)

* coordinates.read_raster: use `.geoms` in case of MultyPolygon.
with shapely 2.0 MultiPolygon is not iterable anymore

* pylint

* from_raster: fix doc strings and default argument values

* test_nightlight: some cleaning up

Author: emanuel-schmid

climada/entity/exposures/base.py

@@ -465,8 +465,8 @@ def set_from_raster(self, *args, **kwargs):
         self.__dict__ = Exposures.from_raster(*args, **kwargs).__dict__
 
     @classmethod
-    def from_raster(cls, file_name, band=1, src_crs=None, window=False,
-                        geometry=False, dst_crs=False, transform=None,
+    def from_raster(cls, file_name, band=1, src_crs=None, window=None,
+                        geometry=None, dst_crs=None, transform=None,
                         width=None, height=None, resampling=Resampling.nearest):
         """Read raster data and set latitude, longitude, value and meta
 
@@ -481,8 +481,8 @@ def from_raster(cls, file_name, band=1, src_crs=None, window=False,
         window : rasterio.windows.Windows, optional
             window where data is
             extracted
-        geometry : shapely.geometry, optional
-            consider pixels only in shape
+        geometry : list of shapely.geometry, optional
+            consider pixels only within these shape
         dst_crs : crs, optional
             reproject to given crs
         transform : rasterio.Affine

climada/entity/exposures/test/test_nightlight.py

@@ -123,27 +123,31 @@ def test_check_nl_local_file_exists(self):
             is produced, the LOGGER messages logged and the ValueError raised. """
 
         # check logger messages by giving a to short req_file
-        with self.assertLogs('climada.entity.exposures.litpop.nightlight', level = 'WARNING') as cm:
+        with self.assertLogs('climada.entity.exposures.litpop.nightlight', level='WARNING') as cm:
             nightlight.check_nl_local_file_exists(required_files = np.array([0, 0, 1, 1]))
-        self.assertIn('The parameter \'required_files\' was too short and '
-                       'is ignored.', cm.output[0])
+        self.assertIn('The parameter \'required_files\' was too short and is ignored',
+                      cm.output[0])
 
         # check logger message: not all files are available 
-        with self.assertLogs('climada.entity.exposures.litpop.nightlight', level = 'DEBUG') as cm:
+        with self.assertLogs('climada.entity.exposures.litpop.nightlight', level='DEBUG') as cm:
             nightlight.check_nl_local_file_exists()
         self.assertIn('Not all satellite files available. '
-                     f'Found 5 out of 8 required files in {Path(SYSTEM_DIR)}', cm.output[0])
+                      f'Found 5 out of 8 required files in {Path(SYSTEM_DIR)}', cm.output[0])
 
-        # check logger message: no files found in checkpath 
-        with self.assertLogs('climada.entity.exposures.litpop.nightlight', level = 'INFO') as cm:
+        # check logger message: no files found in checkpath
+        check_path = Path('climada/entity/exposures')
+        with self.assertLogs('climada.entity.exposures.litpop.nightlight', level='INFO') as cm:
             # using a random path where no files are stored
-            nightlight.check_nl_local_file_exists(check_path = Path('climada/entity/exposures'))
-        self.assertIn('No satellite files found locally in climada/entity/exposures', cm.output[0])
+            nightlight.check_nl_local_file_exists(check_path=check_path)
+        self.assertIn(f'No satellite files found locally in {check_path}',
+                      cm.output[0])
 
         # test raises with wrong path
+        check_path = Path('/random/wrong/path')
         with self.assertRaises(ValueError) as cm:
-            nightlight.check_nl_local_file_exists(check_path = '/random/wrong/path')
-        self.assertEqual('The given path does not exist: /random/wrong/path', str(cm.exception))
+            nightlight.check_nl_local_file_exists(check_path=check_path)
+        self.assertEqual(f'The given path does not exist: {check_path}',
+                         str(cm.exception))
 
         # test that files_exist is correct 
         files_exist = nightlight.check_nl_local_file_exists()

climada/hazard/base.py

@@ -288,8 +288,8 @@ def check(self):
 
     @classmethod
     def from_raster(cls, files_intensity, files_fraction=None, attrs=None,
-                    band=None, haz_type=None, pool=None, src_crs=None, window=False,
-                    geometry=False, dst_crs=False, transform=None, width=None,
+                    band=None, haz_type=None, pool=None, src_crs=None, window=None,
+                    geometry=None, dst_crs=None, transform=None, width=None,
                     height=None, resampling=Resampling.nearest):
         """Create Hazard with intensity and fraction values from raster files
 
@@ -320,8 +320,8 @@ def from_raster(cls, files_intensity, files_fraction=None, attrs=None,
         window : rasterio.windows.Windows, optional
             window where data is
             extracted
-        geometry : shapely.geometry, optional
-            consider pixels only in shape
+        geometry : list of shapely.geometry, optional
+            consider pixels only within these shapes
         dst_crs : crs, optional
             reproject to given crs
         transform : rasterio.Affine

climada/hazard/centroids/centr.py

@@ -423,8 +423,8 @@ def set_raster_file(self, file_name, band=None, **kwargs):
         return self.values_from_raster_files([file_name], band=band, **kwargs)
 
     @classmethod
-    def from_raster_file(cls, file_name, src_crs=None, window=False,
-                         geometry=False, dst_crs=False, transform=None, width=None,
+    def from_raster_file(cls, file_name, src_crs=None, window=None,
+                         geometry=None, dst_crs=None, transform=None, width=None,
                          height=None, resampling=Resampling.nearest):
         """Create a new Centroids object from a raster file
 
@@ -439,8 +439,8 @@ def from_raster_file(cls, file_name, src_crs=None, window=False,
             source CRS. Provide it if error without it.
         window : rasterio.windows.Window, optional
             window to read
-        geometry : shapely.geometry, optional
-            consider pixels only in shape
+        geometry : list of shapely.geometry, optional
+            consider pixels only within these shapes
         dst_crs : crs, optional
             reproject to given crs
         transform : rasterio.Affine
@@ -462,8 +462,8 @@ def from_raster_file(cls, file_name, src_crs=None, window=False,
             transform, width, height, resampling)
         return cls(meta=meta)
 
-    def values_from_raster_files(self, file_names, band=None, src_crs=None, window=False,
-                                 geometry=False, dst_crs=False, transform=None, width=None,
+    def values_from_raster_files(self, file_names, band=None, src_crs=None, window=None,
+                                 geometry=None, dst_crs=None, transform=None, width=None,
                                  height=None, resampling=Resampling.nearest):
         """Read raster of bands and set 0 values to the masked ones.
 
@@ -480,8 +480,8 @@ def values_from_raster_files(self, file_names, band=None, src_crs=None, window=F
             source CRS. Provide it if error without it.
         window : rasterio.windows.Window, optional
             window to read
-        geometry : shapely.geometry, optional
-            consider pixels only in shape
+        geometry : list of shapely.geometry, optional
+            consider pixels only within these shapes
         dst_crs : crs, optional
             reproject to given crs
         transform : rasterio.Affine

climada/util/coordinates.py

@@ -1946,8 +1946,8 @@ def read_raster(file_name, band=None, src_crs=None, window=None, geometry=None,
         band number to read. Default: 1
     window : rasterio.windows.Window, optional
         window to read
-    geometry : shapely.geometry, optional
-        consider pixels only in shape
+    geometry : list of shapely.geometry, optional
+        consider pixels only within these shapes
     dst_crs : crs, optional
         reproject to given crs
     transform : rasterio.Affine