Merge branch 'main' into infrastructure

pysal · Feb 15, 2024 · 6b6d575 · 6b6d575
2 parents 940ed14 + 185123f
commit 6b6d575
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/tobler/area_weighted/area_interpolate.py b/tobler/area_weighted/area_interpolate.py
@@ -260,7 +260,7 @@ def _area_interpolate_binning(
     Returns
     -------
     estimates : geopandas.GeoDataFrame
-         new geodaraframe with interpolated variables as columns and target_df geometry
+         new geodataframe with interpolated variables as columns and target_df geometry
          as output geometry
 
     Notes

diff --git a/tobler/area_weighted/area_interpolate_dask.py b/tobler/area_weighted/area_interpolate_dask.py
@@ -54,7 +54,7 @@ def area_interpolate_dask(
     Returns
     -------
     estimates : dask_geopandas.GeoDataFrame
-         new dask-geopandas geodaraframe with interpolated variables and `id_col` as
+         new dask-geopandas geodataframe with interpolated variables and `id_col` as
          columns and target_df geometry as output geometry
 
     """

diff --git a/tobler/pycno/pycno.py b/tobler/pycno/pycno.py
@@ -274,7 +274,7 @@ def pycno_interpolate(
     Returns
     -------
     geopandas.GeoDataFrame
-        new geodaraframe with interpolated variables as columns and target_df geometry
+        new geodataframe with interpolated variables as columns and target_df geometry
         as output geometry
 
     Notes

diff --git a/tobler/tests/test_utils.py b/tobler/tests/test_utils.py
@@ -4,6 +4,7 @@
 
 import geopandas
 import pytest
+import shapely
 from libpysal.examples import load_example
 from numpy.testing import assert_almost_equal
 

diff --git a/tobler/util/util.py b/tobler/util/util.py
@@ -5,6 +5,7 @@
 import geopandas
 import numpy as np
 import pandas
+import shapely
 from shapely.geometry import Polygon
 
 
@@ -138,7 +139,7 @@ def h3fy(source, resolution=6, clip=False, buffer=False, return_geoms=True):
         else:
             source = source.to_crs(4326)
 
-    source_unary = source.unary_union
+    source_unary = shapely.force_2d(source.unary_union)
 
     if type(source_unary) == Polygon:
         hexagons = _to_hex(