qurator-spk/eynollah
1
0
Fork 0
mirror of https://github.com/qurator-spk/eynollah.git synced 2026-07-26 05:29:16 +02:00
Code Issues Projects Releases Wiki Activity

utils.contour.make_valid: be more robust (avoiding MultiPolygon)

Browse source
This commit is contained in:
Robert Sachunsky 2026-07-17 15:43:47 +02:00
parent c1b276fea1
commit 5939845d1d
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/eynollah/utils/contour.py
View file

@ -354,13 +354,7 @@ def contour2polygon(contour: Union[np.ndarray, Sequence[Sequence[Sequence[Number
polygon = Polygon([point[0] for point in contour]) polygon = Polygon([point[0] for point in contour])
if dilate: if dilate:
polygon = polygon.buffer(dilate) polygon = polygon.buffer(dilate)
if polygon.geom_type == 'GeometryCollection': return ensure_polygon(make_valid(polygon))
# heterogeneous result: filter zero-area shapes (LineString, Point)
polygon = unary_union([geom for geom in polygon.geoms if geom.area > 0])
if polygon.geom_type == 'MultiPolygon':
# homogeneous result: construct convex hull to connect
polygon = join_polygons(polygon.geoms)
return make_valid(polygon)
def polygon2contour(polygon: Polygon) -> np.ndarray: def polygon2contour(polygon: Polygon) -> np.ndarray:
polygon = np.array(polygon.exterior.coords[:-1], dtype=int) polygon = np.array(polygon.exterior.coords[:-1], dtype=int)
@ -371,16 +365,22 @@ def make_intersection(poly1, poly2):
# post-process # post-process
if interp.is_empty or interp.area == 0.0: if interp.is_empty or interp.area == 0.0:
return None return None
if interp.geom_type == 'GeometryCollection': interp = ensure_polygon(interp)
# heterogeneous result: filter zero-area shapes (LineString, Point)
interp = unary_union([geom for geom in interp.geoms if geom.area > 0])
if interp.geom_type == 'MultiPolygon':
# homogeneous result: construct convex hull to connect
interp = join_polygons(interp.geoms)
assert interp.geom_type == 'Polygon', interp.wkt
interp = make_valid(interp) interp = make_valid(interp)
interp = ensure_polygon(interp)
return interp return interp
def ensure_polygon(geometry):
if geometry.geom_type == 'GeometryCollection':
# heterogeneous result: filter zero-area shapes (LineString, Point)
geometry = unary_union([geom for geom in geometry.geoms if geom.area > 0])
if geometry.geom_type == 'MultiPolygon':
# homogeneous result: construct convex hull to connect
geometry = join_polygons(geometry.geoms)
poly = Polygon(geometry)
assert poly.geom_type == 'Polygon', poly.wkt
return poly
def make_valid(polygon: Polygon) -> Polygon: def make_valid(polygon: Polygon) -> Polygon:
"""Ensures shapely.geometry.Polygon object is valid by repeated rearrangement/simplification/enlargement.""" """Ensures shapely.geometry.Polygon object is valid by repeated rearrangement/simplification/enlargement."""
def isint(x): def isint(x):