Centroids.from_excel fix: switch key,val in test_storm_europe rather …

…than in centr!
CLIMADA-project · Dec 8, 2023 · dd7e4cd · dd7e4cd
1 parent 4079f3f
commit dd7e4cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/climada/hazard/centroids/centr.py b/climada/hazard/centroids/centr.py
@@ -48,8 +48,8 @@
     'sheet_name': 'centroids',
     'col_name': {
         'region_id': 'region_id',
-        'latitude': 'latitude',
-        'longitude': 'longitude',
+        'lat': 'latitude',
+        'lon': 'longitude',
         'on_land': 'on_land',
         'dist_coast': 'dist_coast',
         'elevation': 'elevation',
@@ -719,7 +719,7 @@ def from_excel(cls, file_path, crs=DEF_CRS, var_names=None):
             assert 'col_name' in var_names, 'col_name must be a key in the var_names dict'
 
         data = pd.read_excel(file_path, var_names['sheet_name']).rename(
-            columns={val: key for key, val in var_names['col_name'].items()}
+            columns=var_names['col_name']
         )
         return cls(**dict(data.items()), crs=crs)
 

diff --git a/climada/hazard/test/test_storm_europe.py b/climada/hazard/test/test_storm_europe.py
@@ -66,7 +66,7 @@ def test_read_with_cent(self):
         """Test from_footprints while passing in a Centroids object"""
         var_names = copy.deepcopy(DEF_VAR_EXCEL)
         var_names['sheet_name'] = 'fp_centroids-test'
-        var_names['col_name']['region_id'] = 'iso_n3'
+        var_names['col_name']['iso_n3'] = 'region_id'
         test_centroids = Centroids.from_excel(
             DATA_DIR.joinpath('fp_centroids-test.xls'),
             var_names=var_names