Fix bug in centroids natural earth feature test (#768)

* Fix natural earth data test in centroids

* Pass argument as list.
* Make sure `allclose` does not throw a broadcasting error.

* Update CHANGELOG.md

---------

Co-authored-by: Emanuel Schmid <[email protected]>

Author: peanutfun

CHANGELOG.md

@@ -62,6 +62,7 @@ Removed:
 
 - `util.lines_polys_handler` solve polygon disaggregation issue in metre-based projection [#666](https://github.com/CLIMADA-project/climada_python/pull/666)
 - Problem with `pyproj.CRS` as `Impact` attribute, [#706](https://github.com/CLIMADA-project/climada_python/issues/706). Now CRS is always stored as `str` in WKT format.
+- Correctly handle assertion errors in `Centroids.values_from_vector_files` and fix the associated test [#768](https://github.com/CLIMADA-project/climada_python/pull/768/)
 
 ### Deprecated
 

climada/hazard/centroids/centr.py

@@ -575,19 +575,24 @@ def values_from_vector_files(self, file_names, val_names=None, dst_crs=None):
             Sparse array of shape (len(val_name), len(geometry)).
         """
         if val_names is None:
-            val_names = ['intensity']
+            val_names = ["intensity"]
 
         values = []
         for file_name in file_names:
             tmp_lat, tmp_lon, tmp_geometry, data = u_coord.read_vector(
-                file_name, val_names, dst_crs=dst_crs)
-            if not (u_coord.equal_crs(tmp_geometry.crs, self.geometry.crs)
-                    and np.allclose(tmp_lat, self.lat)
-                    and np.allclose(tmp_lon, self.lon)):
-                raise ValueError('Vector data inconsistent with contained vector.')
+                file_name, val_names, dst_crs=dst_crs
+            )
+            try:
+                assert u_coord.equal_crs(tmp_geometry.crs, self.geometry.crs)
+                np.testing.assert_allclose(tmp_lat, self.lat)
+                np.testing.assert_allclose(tmp_lon, self.lon)
+            except AssertionError as exc:
+                raise ValueError(
+                    "Vector data inconsistent with contained vector"
+                ) from exc
             values.append(sparse.csr_matrix(data))
 
-        return sparse.vstack(values, format='csr')
+        return sparse.vstack(values, format="csr")
 
     def read_mat(self, *args, **kwargs):
         """This function is deprecated, use Centroids.from_mat instead."""

climada/hazard/centroids/test/test_vec_ras.py

@@ -617,9 +617,11 @@ def test_from_vector_file(self):
         # Test reading values from file with incompatible geometry
         shp_file = shapereader.natural_earth(resolution='10m', category='cultural',
                                              name='populated_places_simple')
-        with self.assertRaises(ValueError) as ve:
+        with self.assertRaises(ValueError) as cm:
             centr.values_from_vector_files([shp_file], val_names=['pop_min', 'pop_max'])
-        self.assertIn('could not be broadcast together with shapes', str(ve.exception))
+        self.assertIn(
+            "Vector data inconsistent with contained vector", str(cm.exception)
+        )
 
     def test_from_raster_file_wrong_fail(self):
         """Test from_raster_file with wrong centroids"""