@euphrasiologist/lwphylo 1.2.18 → 1.2.19

package/dist/drawPhylogeny.cjs

@@ -475,41 +475,63 @@ function getChildArcsFan(pd) {
 
   // 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π)
+    const d = (b - a + TAU) % TAU; // CCW delta 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 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)
+        .filter(id => byId.has(id))
+    ])
+  );
 
   const child_arcs = [];
 
-  for (const parent of pd) {
-    const kids = childrenByParent.get(parent.thisId) || [];
+  for (const parentRaw of pd) {
+    const pid = key(parentRaw.thisId);
+    const kids = childrenByParent.get(pid) || [];
     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) }))
+      .map(id => {
+        const node = byId.get(id);
+        return node ? { id, a: norm(node.angle) } : null;
+      })
+      .filter(Boolean)
       .sort((u, v) => u.a - v.a);
 
     const N = A.length;
+    if (N < 2) continue;
+
+    const parent = byId.get(pid);
+    const radius = parent?.r;
+    if (!(radius > 0)) continue;
+
     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)
+      // “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);
 
       child_arcs.push({
-        parentId: parent.thisId,
-        childId: cur.id,
-        radius: parent.r,   // IMPORTANT: draw at the PARENT circle
+        parentId: pid,
+        childId:  cur.id,
+        radius,
         start,
         end,
-        sweep: 1            // CCW (matches describeArcSweep usage)
+        sweep: 0 // CCW (consistent with describeArcSweep and your y-flip)
       });
     }
   }
@@ -1431,7 +1453,7 @@ function drawPhylogeny(
       let first = true;
       while (cur && cur.parentId != null) {
         // ----- spoke (parent → child) -----
-        const s = spokeByChild.get(cur.thisId);
+        const s = spokeByChild.get(key(cur.thisId));
         if (s) {
           const px = s.x0,
             py = s.y0;
@@ -1455,23 +1477,21 @@ function drawPhylogeny(
         }
 
         // ----- half-arc at parent radius (parent.angle → child.angle) -----
-        const a = arcByChild.get(cur.thisId);
-        if (a) {
-          function pathFromArcRecord(rec) {
-            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);
-          }
-
+        const a = arcByChild.get(key(cur.thisId));
+        function pathFromArcRecord(rec) {
+          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);
+        }
 
+        if (a) {
           arcLayer
             .append("path")
             .attr("d", pathFromArcRecord(a))
             .attr("fill", "none")
             .attr("stroke", stroke)
             .attr("stroke-width", width);
-
         }
 
         first = false;