other multipolygon type works now

Author: timtreis

src/spatialdata_plot/pl/render.py

@@ -1,11 +1,14 @@
 from __future__ import annotations
 
+import contextlib
 from collections.abc import Sequence
 from copy import copy
 from dataclasses import dataclass
 from functools import partial
+from itertools import chain
 from typing import Any, Callable, Optional, Union
 
+import geopandas as gpd
 import matplotlib
 import numpy as np
 import pandas as pd
@@ -119,9 +122,15 @@ def _get_collection_shape(
         outline_alpha: None | float = None,
         **kwargs: Any,
     ) -> PatchCollection:
-        polygon_df = shapes[shapes["geometry"].apply(lambda geom: geom.geom_type == "Polygon")]
-        multipolygon_df = shapes[shapes["geometry"].apply(lambda geom: geom.geom_type == "MultiPolygon")]
-        circle_df = shapes[shapes["geometry"].apply(lambda geom: geom.geom_type == "Point")]
+        polygon_df = shapes[
+            shapes["geometry"].apply(lambda geom: geom.geom_type == "Polygon")  # type: ignore[call-overload]
+        ]
+        multipolygon_df = shapes[
+            shapes["geometry"].apply(lambda geom: geom.geom_type == "MultiPolygon")  # type: ignore[call-overload]
+        ]
+        circle_df = shapes[
+            shapes["geometry"].apply(lambda geom: geom.geom_type == "Point")  # type: ignore[call-overload]
+        ]
 
         patches = []
         if len(polygon_df) > 0:
@@ -133,6 +142,10 @@ def _get_collection_shape(
         if len(multipolygon_df) > 0:
             patches += [_make_patch_from_multipolygon(mp) for mp in multipolygon_df["geometry"]]
 
+        # flatten list since multipolygons cause a nested list
+        with contextlib.suppress(Exception):
+            patches = list(chain.from_iterable([x] if not isinstance(x, list) else x for x in patches))
+
         cmap = kwargs["cmap"]
 
         try:
@@ -169,6 +182,8 @@ def _get_collection_shape(
     if len(color_vector) == 0:
         color_vector = [render_params.cmap_params.na_color]
 
+    shapes = pd.concat(shapes, ignore_index=True)
+    shapes = gpd.GeoDataFrame(shapes, geometry="geometry")
     _cax = _get_collection_shape(
         shapes=shapes,
         s=render_params.size,

src/spatialdata_plot/pl/utils.py

@@ -1134,36 +1134,44 @@ def _robust_transform(element: Any, cs: str) -> Any:
 
 def _split_multipolygon_into_outer_and_inner(mp: shapely.MultiPolygon):  # type: ignore
     # https://stackoverflow.com/a/21922058
-    if len(mp.geoms) > 1:
-        raise NotImplementedError("Currently, lists of Polygons are not supported. Only Polygons with holes.")
-
-    geom = mp.geoms[0]
-    if geom.type == "Polygon":
-        exterior_coords = geom.exterior.coords[:]
-        interior_coords = []
-        for interior in geom.interiors:
-            interior_coords += interior.coords[:]
-    elif geom.type == "MultiPolygon":
-        exterior_coords = []
-        interior_coords = []
-        for part in geom:
-            epc = _split_multipolygon_into_outer_and_inner(part)  # Recursive call
-            exterior_coords += epc["exterior_coords"]
-            interior_coords += epc["interior_coords"]
-    else:
-        raise ValueError("Unhandled geometry type: " + repr(geom.type))
+
+    for geom in mp.geoms:
+        if geom.geom_type == "Polygon":
+            exterior_coords = geom.exterior.coords[:]
+            interior_coords = []
+            for interior in geom.interiors:
+                interior_coords += interior.coords[:]
+        elif geom.geom_type == "MultiPolygon":
+            exterior_coords = []
+            interior_coords = []
+            for part in geom:
+                epc = _split_multipolygon_into_outer_and_inner(part)  # Recursive call
+                exterior_coords += epc["exterior_coords"]
+                interior_coords += epc["interior_coords"]
+        else:
+            raise ValueError("Unhandled geometry type: " + repr(geom.type))
 
     return interior_coords, exterior_coords
 
 
 def _make_patch_from_multipolygon(mp: shapely.MultiPolygon) -> mpatches.PathPatch:
     # https://matplotlib.org/stable/gallery/shapes_and_collections/donut.html
 
-    inside, outside = _split_multipolygon_into_outer_and_inner(mp)
-    codes = np.ones(len(inside), dtype=mpath.Path.code_type) * mpath.Path.LINETO
-    codes[0] = mpath.Path.MOVETO
-    vertices = np.concatenate((outside, inside[::-1]))
-    all_codes = np.concatenate((codes, codes))
-    path = mpath.Path(vertices, all_codes)
+    patches = []
+    for geom in mp.geoms:
+        if len(geom.interiors) == 0:
+            # polygon has no holes
+            patches += [mpatches.Polygon(geom.exterior.coords, closed=True)]
+        else:
+            inside, outside = _split_multipolygon_into_outer_and_inner(mp)
+            if len(inside) > 0:
+                codes = np.ones(len(inside), dtype=mpath.Path.code_type) * mpath.Path.LINETO
+                codes[0] = mpath.Path.MOVETO
+                all_codes = np.concatenate((codes, codes))
+                vertices = np.concatenate((outside, inside[::-1]))
+            else:
+                all_codes = []
+                vertices = np.concatenate(outside)
+            patches += [mpatches.PathPatch(mpath.Path(vertices, all_codes))]
 
-    return mpatches.PathPatch(path)
+    return patches