@euphrasiologist/lwphylo 1.2.12 → 1.2.15

package/dist/drawPhylogeny.esm.js

@@ -448,6 +448,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
 
 /**
@@ -494,7 +542,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 };
 }
@@ -1094,6 +1147,10 @@ function drawPhylogeny(
 
     return svg.node();
   } else if (layout === "radial") {
+    // RADIAL LAYOUT
+    if (width !== height) {
+      throw new Error("width and height must be the same for radial layout");
+    }
     const parsedTree = readTree(treeText);
     const rad = radialLayout(parsedTree, {
       angleStrategy: "fan",
@@ -1103,6 +1160,10 @@ function drawPhylogeny(
     // ===== MODE =====
     const TIP_MODE = radialMode; // "phylo" (shorten to original tips) or "outer" (project to one circle)
     const isOuter = TIP_MODE === "outer";
+    if (TIP_MODE !== "phylo" && TIP_MODE !== "outer") {
+      throw new Error("radialMode must be either 'phylo' or 'outer'");
+    }
+
 
     // visuals (0 = let spokes reach the dots)
     const DOT_R = 3;
@@ -1195,7 +1256,6 @@ function drawPhylogeny(
             d.sweep
           )
       )
-
       .attr("fill", "none")
       .attr("stroke", "#777")
       .attr("stroke-width", strokeWidth);
@@ -1268,7 +1328,7 @@ function drawPhylogeny(
 
     // maps for fast lookup on hover (childId → spoke / arc)
     const spokeByChild = new Map(rad.radii.map((s) => [childIdOf(s), s]));
-    const arcByChild = new Map(rad.child_arcs.map((a) => [a.childId, a]));
+    const arcByChild = new Map((rad.child_arcs ?? []).map((a) => [a.childId, a]));
 
     // ===== LABELS =====
     // Labels — make them follow the tip position used by the current mode
@@ -1374,29 +1434,17 @@ 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);
+
           arcLayer
             .append("path")
-            .attr("d", (d) =>
-              d.sweep == null
-                ? describeArc(
-                  centerX,
-                  centerY,
-                  radiusPx(d.radius),
-                  d.start,
-                  d.end
-                )
-                : describeArcSweep(
-                  centerX,
-                  centerY,
-                  radiusPx(d.radius),
-                  d.start,
-                  d.end,
-                  d.sweep
-                )
-            )
+            .attr("d", pathD)
             .attr("fill", "none")
             .attr("stroke", stroke)
             .attr("stroke-width", width);
+
         }
 
         first = false;