@euphrasiologist/lwphylo 1.2.21 → 1.2.23

package/dist/drawPhylogeny.cjs

@@ -66,6 +66,13 @@ 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*/) {
+  console.log("describeArcSweep input:", {
+    cx, cy, r,
+    a0Deg: (a0 * 180 / Math.PI).toFixed(2),
+    a1Deg: (a1 * 180 / Math.PI).toFixed(2),
+    sweep
+  });
+
   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;
@@ -473,9 +480,6 @@ 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π)
@@ -524,14 +528,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;
+      // Use SVG-conforming sweep logic
+      const delta = (end - start + TAU) % TAU;
+      const sweep = delta > Math.PI ? 0 : 1;
 
       child_arcs.push({
         parentId: pid,
@@ -542,6 +544,7 @@ function getChildArcsFan(pd) {
         sweep
       });
     }
+
   }
 
   return child_arcs;
@@ -1495,6 +1498,14 @@ function drawPhylogeny(
         }
 
         if (a) {
+          console.log("Drawing arc:", {
+            childId: cur.thisId,
+            startDeg: (a.start * 180 / Math.PI).toFixed(2),
+            endDeg: (a.end * 180 / Math.PI).toFixed(2),
+            sweep: a.sweep,
+            radius: a.radius
+          });
+
           arcLayer
             .append("path")
             .attr("d", pathFromArcRecord(a))