Added daskgeopandas check to is_geodataframe function

hvplot/tests/testutil.py

@@ -7,6 +7,13 @@
 import panel as pn
 import pytest
 
+try:
+    import spatialpandas
+    import dask
+except ImportError:
+    spatialpandas = None
+    dask = None
+
 from unittest import TestCase, SkipTest
 
 from hvplot.util import (
@@ -16,6 +23,7 @@
     process_xarray,
     _convert_col_names_to_str,
     instantiate_crs_str,
+    is_geodataframe,
 )
 
 
@@ -184,7 +192,7 @@ def test_process_xarray_dataset_with_x_as_derived_datetime(self):
 
 class TestDynamicArgs(TestCase):
     def test_dynamic_and_static(self):
-        from ..util import process_dynamic_args
+        from hvplot.util import process_dynamic_args
 
         x = 'sepal_width'
         y = pn.widgets.Select(
@@ -198,7 +206,7 @@ def test_dynamic_and_static(self):
         assert arg_deps == []
 
     def test_dynamic_kwds(self):
-        from ..util import process_dynamic_args
+        from hvplot.util import process_dynamic_args
 
         x = 'sepal_length'
         y = 'sepal_width'
@@ -211,7 +219,7 @@ def test_dynamic_kwds(self):
         assert arg_deps == []
 
     def test_fn_kwds(self):
-        from ..util import process_dynamic_args
+        from hvplot.util import process_dynamic_args
 
         x = 'sepal_length'
         y = 'sepal_width'
@@ -361,3 +369,22 @@ def test_instantiate_crs_str_kwargs():
     assert isinstance(crs, ccrs.PlateCarree)
     assert isinstance(crs.globe, ccrs.Globe)
     assert crs.globe.datum == 'WGS84'
+
+
+@pytest.mark.skipif(
+    spatialpandas is None or dask is None, reason='spatialpandas or dask is not available'
+)
+def test_is_geodataframe_spatialpandas_dask():
+    import dask.dataframe as dd
+    import spatialpandas as spd
+
+    square = spd.geometry.Polygon([(0.0, 0), (0, 1), (1, 1), (1, 0)])
+    sdf = spd.GeoDataFrame({'geometry': spd.GeoSeries([square, square]), 'name': ['A', 'B']})
+    sddf = dd.from_pandas(sdf, npartitions=2)
+    assert isinstance(sddf, spd.dask.DaskGeoDataFrame)
+    assert is_geodataframe(sddf)
+
+
+def test_is_geodataframe_classic_dataframe():
+    df = pd.DataFrame({'geometry': [None, None], 'name': ['A', 'B']})
+    assert not is_geodataframe(df)

hvplot/util.py

@@ -473,8 +473,9 @@ def process_intake(data, use_dask):
 def is_geodataframe(data):
     if 'spatialpandas' in sys.modules:
         import spatialpandas as spd
+        from spatialpandas.dask import DaskGeoDataFrame
 
-        if isinstance(data, spd.GeoDataFrame):
+        if isinstance(data, (spd.GeoDataFrame, DaskGeoDataFrame)):
             return True
     return (
         isinstance(data, pd.DataFrame) and hasattr(data, 'geom_type') and hasattr(data, 'geometry')