@euphrasiologist/lwphylo 1.2.11 → 1.2.13

package/dist/drawPhylogeny.cjs

@@ -1115,6 +1115,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",
@@ -1124,6 +1128,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;
@@ -1199,14 +1207,24 @@ function drawPhylogeny(
       .data(rad.arcs)
       .join("path")
       .attr("d", (d) =>
-        describeArc(
-          centerX,
-          centerY,
-          Math.max(0, radiusPx(d.radius)),
-          d.start,
-          d.end
-        )
+        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("fill", "none")
       .attr("stroke", "#777")
       .attr("stroke-width", strokeWidth);
@@ -1279,7 +1297,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
@@ -1385,29 +1403,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;