deoverlap 3.2.1__tar.gz → 3.2.2__tar.gz

{deoverlap-3.2.1/src/deoverlap.egg-info → deoverlap-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deoverlap
-Version: 3.2.1
+Version: 3.2.2
 Summary: De-overlap Shapely geometries that sit within a tolerance of each other.
 Author-email: Pietro Leoni <pietro.leoni@gmail.com>
 License: MIT License

{deoverlap-3.2.1 → deoverlap-3.2.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deoverlap"
-version = "3.2.1"
+version = "3.2.2"
 authors = [
   { name="Pietro Leoni", email="pietro.leoni@gmail.com" },
 ]

{deoverlap-3.2.1 → deoverlap-3.2.2}/src/deoverlap/__init__.py

@@ -1,6 +1,6 @@
 """De-overlap Shapely geometries that sit within a tolerance of each other."""
 
-__version__ = "3.2.1"
+__version__ = "3.2.2"
 
 from .deoverlap import (
     ClipMode,

{deoverlap-3.2.1 → deoverlap-3.2.2}/src/deoverlap/deoverlap.py

@@ -69,6 +69,7 @@ class _SegId:
     index: int
     count: int
     closed: bool
+    heading: float = 0.0  # direction of travel, radians
 
 
 @dataclass
@@ -189,6 +190,17 @@ def _seg_adjacent(a: _SegId, b: _SegId, window: int) -> bool:
     return False
 
 
+def _heading(a: tuple[float, float], b: tuple[float, float]) -> float:
+    return math.atan2(b[1] - a[1], b[0] - a[0])
+
+
+def _folds_back(a: _SegId, b: _SegId, angle_tol_rad: float) -> bool:
+    """True if the chain doubles back: headings nearly opposite (a hairpin)."""
+    d = abs(a.heading - b.heading) % (2 * math.pi)
+    d = min(d, 2 * math.pi - d)
+    return d > math.pi - angle_tol_rad
+
+
 def _reassemble(parts: Sequence[BaseGeometry], original: BaseGeometry) -> BaseGeometry:
     clean = [p for p in parts if p is not None and not p.is_empty]
     if not clean:
@@ -200,6 +212,10 @@ def _reassemble(parts: Sequence[BaseGeometry], original: BaseGeometry) -> BaseGe
         and merged.equals(original.boundary)
     ):
         return original
+    if merged.geom_type == "MultiLineString":
+        # Rejoin pieces that meet end to end: the arc through a ring's start
+        # vertex, or consecutive edges in segments mode.
+        merged = line_merge(merged)
     return merged
 
 
@@ -285,7 +301,7 @@ def _explode_segments(
                         continue
                     segments.append(LineString([a, b]))
                     origins.append(origin)
-                    seg_ids.append(_SegId(chain, i, count, True))
+                    seg_ids.append(_SegId(chain, i, count, True, _heading(a, b)))
                     parent_lengths.append(parent_len)
             else:
                 count = len(coords) - 1
@@ -295,7 +311,7 @@ def _explode_segments(
                         continue
                     segments.append(LineString([a, b]))
                     origins.append(origin)
-                    seg_ids.append(_SegId(chain, i, count, False))
+                    seg_ids.append(_SegId(chain, i, count, False, _heading(a, b)))
                     parent_lengths.append(parent_len)
             chain += 1
 
@@ -407,6 +423,7 @@ class _MaskIndex:
                 seg_id is not None
                 and other_seg is not None
                 and _seg_adjacent(seg_id, other_seg, self.segment_adjacency)
+                and not _folds_back(seg_id, other_seg, angle_tol_rad)
             ):
                 continue
             if self.parallel_only and angle is not None:

{deoverlap-3.2.1 → deoverlap-3.2.2/src/deoverlap.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deoverlap
-Version: 3.2.1
+Version: 3.2.2
 Summary: De-overlap Shapely geometries that sit within a tolerance of each other.
 Author-email: Pietro Leoni <pietro.leoni@gmail.com>
 License: MIT License

{deoverlap-3.2.1 → deoverlap-3.2.2}/tests/test_deoverlap.py

@@ -108,6 +108,35 @@ def test_group_keeps_split_ring_as_one_multipart():
     assert len(flat_result.kept) >= 2
 
 
+def test_cut_ring_joins_across_its_start_point():
+    """The arc through the ring's first/last vertex is one piece, not two."""
+    ring = LineString([(0, 0), (2, 0), (2, 2), (0, 2), (0, 0)])
+    cutter = LineString([(1, -1), (1, 3)])
+    grouped = deoverlap([cutter, ring], 0.15, group=True, keep=KeepPolicy.FIRST)
+    assert len(flatten_geometries(grouped.kept_parts[1])) == 2
+    flat = deoverlap([cutter, ring], 0.15, group=False, keep=KeepPolicy.FIRST)
+    assert len(flat.kept) == 3  # cutter + two arcs
+
+
+def test_segments_removes_fold_back_between_neighbours():
+    """A hairpin folds onto itself; neighbouring edges must still suppress."""
+    spike = LineString([(0, 0), (6, 0), (6.5, 0.4), (6, 0.08), (0, 0.08), (0, 0)])
+    result = deoverlap(
+        [spike], 0.1, segments=True, parallel_only=True, keep="first",
+        min_length=0.05, keep_duplicates=True,
+    )
+    kept = result.kept_parts[0]
+    back = LineString([(6.5, 0.4), (6, 0.08)])
+    assert kept.intersection(back.buffer(0.01)).length < 0.1
+
+
+def test_segments_keeps_ordinary_corners():
+    """A 90 degree corner between neighbours is not a fold-back."""
+    square = LineString([(0, 0), (2, 0), (2, 2), (0, 2), (0, 0)])
+    result = deoverlap([square], 0.3, segments=True, parallel_only=True)
+    assert result.kept_parts[0].length == pytest.approx(square.length, abs=0.05)
+
+
 def test_parallel_only_preserves_crossing():
     horizontal = LineString([(0, 0), (4, 0)])
     vertical = LineString([(2, -2), (2, 2)])