@euphrasiologist/lwphylo 1.2.13 → 1.2.16

package/dist/drawPhylogeny.cjs

@@ -469,6 +469,54 @@ function getChildArcs(pd) {
   return arcs;
 }
 
+function getChildArcsFan(pd) {
+  const TAU = Math.PI * 2;
+  const norm = (t) => ((t % TAU) + TAU) % TAU;
+
+  // Circular midpoint that travels CCW from a -> b by half the CCW span
+  function midCCW(a, b) {
+    const d = (b - a + TAU) % TAU;     // CCW delta a->b in [0, 2π)
+    return norm(a + d / 2);
+  }
+
+  const byId = new Map(pd.map(d => [d.thisId, d]));
+  const childrenByParent = new Map(pd.map(d => [d.thisId, d.children || []]));
+
+  const child_arcs = [];
+
+  for (const parent of pd) {
+    const kids = childrenByParent.get(parent.thisId) || [];
+    if (kids.length < 2) continue;
+
+    // Sort children by angle (normalized) around the circle
+    const A = kids
+      .map(id => ({ id, a: norm(byId.get(id).angle) }))
+      .sort((u, v) => u.a - v.a);
+
+    const N = A.length;
+    for (let i = 0; i < N; i++) {
+      const prev = A[(i - 1 + N) % N];
+      const cur  = A[i];
+      const next = A[(i + 1) % N];
+
+      // “fan” wedge around the child: midpoint(prev→cur) .. midpoint(cur→next)
+      const start = midCCW(prev.a, cur.a);
+      const end   = midCCW(cur.a, next.a);
+
+      child_arcs.push({
+        parentId: parent.thisId,
+        childId: cur.id,
+        radius: parent.r,   // IMPORTANT: draw at the PARENT circle
+        start,
+        end,
+        sweep: 0            // CCW (matches describeArcSweep usage)
+      });
+    }
+  }
+
+  return child_arcs;
+}
+
 // src/radial/radialLayout.js
 
 /**
@@ -515,7 +563,12 @@ function radialLayout(node, opts = {}) {
     : getArcs(pd);
 
   // per-child arcs for half-arc highlighting if you already use them
-  const child_arcs = getChildArcs(pd);
+  let child_arcs = [];
+  if (opts.arcsStyle === "fan") {
+    child_arcs = getChildArcsFan(pd);
+  } else {
+    child_arcs = getChildArcs(pd);
+  }
 
   return { data: pd, radii, arcs, child_arcs };
 }
@@ -1183,6 +1236,29 @@ function drawPhylogeny(
       return { X0, Y0, X1s: X0 + dx * t, Y1s: Y0 + dy * t, len };
     }
 
+    // put this next to your other radial helpers (top of file or in your lib)
+    function arcPathCCW(cx, cy, R, a0, a1) {
+      const TAU = Math.PI * 2;
+      const norm = (t) => ((t % TAU) + TAU) % TAU;
+
+      a0 = norm(a0);
+      a1 = norm(a1);
+
+      const delta = (a1 - a0 + TAU) % TAU;     // CCW span a0 -> a1 in [0, 2π)
+      if (delta < 1e-9) return "";             // degenerate; draw nothing
+
+      // With your polarToCartesian using y = cy - r*sin(t),
+      // sweepFlag=0 gives a visually CCW arc segment.
+      const largeArcFlag = delta > Math.PI ? 1 : 0;
+      const sweepFlag = 0;
+
+      const p0 = polarToCartesian(cx, cy, R, a0);
+      const p1 = polarToCartesian(cx, cy, R, a1);
+
+      return `M ${p0.x} ${p0.y} A ${R} ${R} 0 ${largeArcFlag} ${sweepFlag} ${p1.x} ${p1.y}`;
+    }
+
+
     // ===== SVG ROOT =====
     const svg = d3__namespace
       .create("svg")
@@ -1224,7 +1300,6 @@ function drawPhylogeny(
             d.sweep
           )
       )
-
       .attr("fill", "none")
       .attr("stroke", "#777")
       .attr("stroke-width", strokeWidth);
@@ -1403,9 +1478,7 @@ function drawPhylogeny(
         // ----- half-arc at parent radius (parent.angle → child.angle) -----
         const a = arcByChild.get(cur.thisId);
         if (a) {
-          const pathD = (a.sweep == null)
-            ? describeArc(centerX, centerY, radiusPx(a.radius), a.start, a.end)
-            : describeArcSweep(centerX, centerY, radiusPx(a.radius), a.start, a.end, a.sweep);
+          const pathD = arcPathCCW(centerX, centerY, radiusPx(a.radius), a.start, a.end);
 
           arcLayer
             .append("path")