fixing geodataframe issues

emanuel-schmid · emanuel-schmid · commit d6d2859096fc · 2024-03-14T11:23:48.000+01:00
diff --git a/climada/entity/exposures/test/test_base.py b/climada/entity/exposures/test/test_base.py
@@ -280,7 +280,7 @@ def test_error_geometry_fail(self):
         """Wrong exposures definition"""
         expo = good_exposures()
         expo.set_geometry_points()
-        expo.gdf.latitude.values[0] = 5
+        expo.gdf.loc[0, 'latitude'] = 5
 
         with self.assertRaises(ValueError):
             expo.check()
diff --git a/climada/util/coordinates.py b/climada/util/coordinates.py
@@ -2743,18 +2743,20 @@ def apply_point(df_exp):
             return df_exp.apply(lambda row: Point(row.longitude, row.latitude), axis=1)
 
         ddata = dd.from_pandas(df_val, npartitions=cpu_count())
-        df_val['geometry'] = ddata.map_partitions(
+        df_val['_-geometry-prov'] = ddata.map_partitions(
                                  apply_point,
                                  meta=('geometry', gpd.array.GeometryDtype)
                              ).compute(scheduler=scheduler)
+
     # single process
     else:
-        df_val['geometry'] = gpd.GeoSeries(
-            gpd.points_from_xy(df_val.longitude, df_val.latitude), index=df_val.index, crs=crs)
+        df_val['_-geometry-prov'] = gpd.GeoSeries(
+            gpd.points_from_xy(df_val.longitude, df_val.latitude),
+            index=df_val.index)
 
-    # set crs
-    if crs:
-        df_val.set_crs(crs, inplace=True)
+    # A 'geometry' column must not be created in a GeoDataFrame except through the constructor
+    # or with set_geometry. That's why we first made a temporary columns with a weird name
+    df_val.set_geometry('_-geometry-prov', inplace=True, drop=True, crs=crs)
 
 
 def fao_code_def():
