@euphrasiologist/lwphylo 1.2.22 → 1.2.24

package/dist/drawPhylogeny.cjs

@@ -62,23 +62,21 @@ function describeArc(cx, cy, radius, startAngle, endAngle) {
 }
 
 // src/radial/describeArcSweep.js
-const TAU$1 = Math.PI * 2;
-const norm$1 = (t) => ((t % TAU$1) + TAU$1) % TAU$1;
-
-function describeArcSweep(cx, cy, r, a0, a1, sweep /*0=CCW,1=CW*/) {
+function describeArcSweep(cx, cy, r, a0, a1, sweep = 1, largeArcFlag = 0) {
   console.log("describeArcSweep input:", {
     cx, cy, r,
     a0Deg: (a0 * 180 / Math.PI).toFixed(2),
     a1Deg: (a1 * 180 / Math.PI).toFixed(2),
-    sweep
+    sweep,
+    largeArcFlag
   });
 
-  const delta = sweep === 0 ? norm$1(a1 - a0) : norm$1(a0 - a1);
-  if (!(r > 0) || delta < 1e-9) return "";
-  const largeArcFlag = delta > Math.PI ? 1 : 0;
+  if (!(r > 0)) return "";
 
-  const x0 = cx + r * Math.cos(a0), y0 = cy - r * Math.sin(a0);
-  const x1 = cx + r * Math.cos(a1), y1 = cy - r * Math.sin(a1);
+  const x0 = cx + r * Math.cos(a0);
+  const y0 = cy - r * Math.sin(a0);
+  const x1 = cx + r * Math.cos(a1);
+  const y1 = cy - r * Math.sin(a1);
 
   return `M ${x0} ${y0} A ${r} ${r} 0 ${largeArcFlag} ${sweep} ${x1} ${y1}`;
 }
@@ -480,22 +478,16 @@ function getChildArcsFan(pd) {
   const TAU = Math.PI * 2;
   const norm = (t) => ((t % TAU) + TAU) % TAU;
 
-  const ccwDelta = (a0, a1) => (a1 - a0 + TAU) % TAU;
-  const cwDelta = (a0, a1) => (a0 - a1 + 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 in [0, 2π)
+    const d = (b - a + TAU) % TAU;
     return norm(a + d / 2);
   }
 
   const key = (x) => (typeof x === "string" ? +x : x);
-
   const byId = new Map(pd.map(d => [key(d.thisId), d]));
   const childrenByParent = new Map(
     pd.map(d => [
       key(d.thisId),
-      // normalize children to numeric IDs; drop anything we can't resolve
       (d.children || [])
         .map(ch => (typeof ch === "object" ? ch.thisId : ch))
         .map(key)
@@ -510,7 +502,6 @@ function getChildArcsFan(pd) {
     const kids = childrenByParent.get(pid) || [];
     if (kids.length < 2) continue;
 
-    // Sort children by angle (normalized) around the circle
     const A = kids
       .map(id => {
         const node = byId.get(id);
@@ -531,14 +522,12 @@ function getChildArcsFan(pd) {
       const cur = A[i];
       const next = A[(i + 1) % N];
 
-      // “fan” wedge around the child: midpoint(prev→cur) .. midpoint(cur→next), CCW
       const start = midCCW(prev.a, cur.a);
       const end = midCCW(cur.a, next.a);
 
-      // Choose the **shorter** sweep (0 = CCW, 1 = CW in our math-angle convention)
-      const ccw = ccwDelta(start, end);
-      const cw = cwDelta(start, end);
-      const sweep = ccw <= cw ? 0 : 1;
+      const sweep = 1; // always clockwise
+      const delta = (end - start + TAU) % TAU;
+      const largeArc = delta > Math.PI ? 1 : 0;
 
       child_arcs.push({
         parentId: pid,
@@ -546,7 +535,8 @@ function getChildArcsFan(pd) {
         radius,
         start,
         end,
-        sweep
+        sweep,
+        largeArc
       });
     }
   }
@@ -1309,7 +1299,8 @@ function drawPhylogeny(
             radiusPx(d.radius),
             d.start,
             d.end,
-            d.sweep
+            d.sweep,
+            d.largeArc,
           )
       )
       .attr("fill", "none")
@@ -1498,7 +1489,7 @@ function drawPhylogeny(
           const R = radiusPx(rec.radius);
           return rec.sweep == null
             ? describeArc(centerX, centerY, R, rec.start, rec.end)
-            : describeArcSweep(centerX, centerY, R, rec.start, rec.end, rec.sweep);
+            : describeArcSweep(centerX, centerY, R, rec.start, rec.end, rec.sweep, a.largeArc);
         }
 
         if (a) {