@figtreejs/core 0.1.0-beta.2 → 0.1.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@figtreejs/core",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.4",
   "description": "A react component library for phylogenetic visualization and app building",
   "repository": {
     "type": "git",

package/src/evo/tree/normalized-tree/immutable-tree.test.ts

@@ -1,7 +1,13 @@
 //TODO test immutable tree include tests that check nodes to roots update as well.
 
 import { notNull, u } from "../../../utils/maybe";
-import { ImmutableTree } from "./immutable-tree";
+import {
+  ImmutableTree,
+  postOrderIterator,
+  preOrderIterator,
+  psuedoRootPostOrderIterator,
+  psuedoRootPreOrderIterator,
+} from "./immutable-tree";
 import { describe, it, expect } from "vitest";
 
 describe("ImmutableTree", () => {
@@ -156,3 +162,42 @@ describe("testing annotating", () => {
     annotatedTree.getAnnotation(A, "state");
   });
 });
+//.       -----2 (A)
+//        |
+// -------1
+// |      |
+// 0      ------3 (B)
+// |
+// -----4 (C)
+describe("Tree traversals", () => {
+  it("preOrder", () => {
+    const tree = ImmutableTree.fromNewick("((A:1,B:1):1,C:2);");
+    const nodes = [...preOrderIterator(tree)];
+    expect(nodes.map((n) => n.number)).toEqual([0, 1, 2, 3, 4]);
+  });
+
+  it("postOrder", () => {
+    const tree = ImmutableTree.fromNewick("((A:1,B:1):1,C:2);");
+    const nodes = [...postOrderIterator(tree)];
+    expect(nodes.map((n) => n.number)).toEqual([2, 3, 1, 4, 0]);
+  });
+
+  it("pseudoRootPostOrder", () => {
+    const tree = ImmutableTree.fromNewick("((A:1,B:1):1,C:2);");
+    const nodes = [...psuedoRootPostOrderIterator(tree, tree.getNode("A"))];
+    expect(nodes.map((n) => n.number)).toEqual([3, 4, 0, 1, 2]);
+  });
+
+  it("pseudoRootPreOrder", () => {
+    const tree = ImmutableTree.fromNewick("((A:1,B:1):1,C:2);");
+    const nodes = [...psuedoRootPreOrderIterator(tree, tree.getNode("A"))];
+    expect(nodes.map((n) => n.number)).toEqual([2, 1, 3, 0, 4]);
+  });
+
+  it("pseudoRootPreOrder", () => {
+    const tree = ImmutableTree.fromNewick("((A:1,B:1):1,C:2);");
+    const rooted = tree.reroot(tree.getNode("A"));
+    const nodes = [...psuedoRootPreOrderIterator(rooted, tree.getNode("A"))];
+    expect(nodes.map((n) => n.number)).toEqual([2, 0, 1, 3, 4]);
+  });
+});

package/src/evo/tree/normalized-tree/immutable-tree.ts

@@ -21,7 +21,7 @@ import { immerable, produce } from "immer";
 import type { Taxon, TaxonSetInterface } from "../taxa/taxon";
 import { TaxonSet } from "../taxa/taxon";
 import { format } from "d3-format";
-import { extent } from "d3-array";
+import { extent, min } from "d3-array";
 
 import {
   MaybeType,
@@ -1200,24 +1200,69 @@ export function* preOrderIterator(
   yield* traverse(node);
 }
 
-//TODO return the node and edge length of direction
-export function* psuedoRootPreOrderIterator(
+// we want to traverse the tree in a consistent order
+// this requires ignoring the root when we hit it.
+function stableNodeNumber(tree: Tree, a: NodeRef, node: NodeRef) {
+  let num;
+  if (tree.isRoot(a)) {
+    num = min(
+      tree.getChildren(a).filter((child) => child.number != node.number),
+      (n) => n.number,
+    );
+  } else {
+    num = a.number;
+  }
+  return unNullify(
+    num,
+    "There was an error finding the path through the root. check the children",
+  );
+}
+
+type PseudoNode = NodeRef & {
+  pseudoChildren: NodeRef[];
+  pseudoLength: number | undefined;
+  pseudoParent: NodeRef | undefined;
+};
+// children order will matter but parents are always added after children
+export function* psuedoRootPostOrderIterator(
   tree: Tree,
   node: NodeRef | undefined = undefined,
-  sort: (a: NodeRef, b: NodeRef) => number = (a, b) => a.number - b.number,
-): Generator<NodeRef> {
+  // sort: (a: NodeRef, b: NodeRef) => number = (a, b) => a.number - b.number,
+): Generator<PseudoNode> {
   const traverse = function* (
     node: NodeRef,
     visited: number | undefined = undefined,
-  ): Generator<NodeRef> {
-    yield tree.getNode(node.number); // get from tree so we keep proxy when used in draft
-    const branches = [...tree.getChildren(node), tree.getParent(node)].filter(
-      (n) => n.number !== visited,
-    ); //
-    branches.sort(sort);
-    for (const branch of branches) {
-      yield* traverse(branch, node.number);
+  ): Generator<PseudoNode> {
+    // get from tree so we keep proxy when used in draft
+    const branches = [...tree.getChildren(node)];
+    if (!tree.isRoot(node)) {
+      branches.push(tree.getParent(node));
+    }
+    const pseudoChildren = branches.filter((n) => n.number !== visited);
+    const pseudoParent = branches.find((node) => node.number === visited);
+    // branches.sort(sort);
+    pseudoChildren.sort(
+      (a, b) =>
+        stableNodeNumber(tree, a, node) - stableNodeNumber(tree, b, node),
+    );
+    let pseudoLength = undefined;
+    if (!tree.isRoot(node) && pseudoParent === tree.getParent(node)) {
+      // the root will not have a parent
+      pseudoLength = tree.getLength(node);
+    } else {
+      if (pseudoParent !== undefined) {
+        pseudoLength = tree.getLength(pseudoParent);
+      }
+    }
+    for (const someKid of pseudoChildren) {
+      yield* traverse(someKid, node.number);
     }
+    yield {
+      ...tree.getNode(node.number),
+      pseudoLength,
+      pseudoChildren,
+      pseudoParent,
+    };
   };
 
   if (node === undefined) {
@@ -1226,24 +1271,48 @@ export function* psuedoRootPreOrderIterator(
   yield* traverse(node);
 }
 
-export function* psuedoRootPostOrderIterator(
+// children order will matter but parents are always added after children
+export function* psuedoRootPreOrderIterator(
   tree: Tree,
   node: NodeRef | undefined = undefined,
-  sort: (a: NodeRef, b: NodeRef) => number = (a, b) => a.number - b.number,
-): Generator<NodeRef> {
+  // sort: (a: NodeRef, b: NodeRef) => number = (a, b) => a.number - b.number,
+): Generator<PseudoNode> {
   const traverse = function* (
     node: NodeRef,
     visited: number | undefined = undefined,
-  ): Generator<NodeRef> {
+  ): Generator<PseudoNode> {
     // get from tree so we keep proxy when used in draft
-    const branches = [...tree.getChildren(node), tree.getParent(node)].filter(
-      (n) => n.number !== visited,
+    const branches = [...tree.getChildren(node)];
+    if (!tree.isRoot(node)) {
+      branches.push(tree.getParent(node));
+    }
+
+    const pseudoChildren = branches.filter((n) => n.number !== visited);
+    const pseudoParent = branches.find((node) => node.number === visited);
+    pseudoChildren.sort(
+      (a, b) =>
+        stableNodeNumber(tree, a, node) - stableNodeNumber(tree, b, node),
     );
-    branches.sort(sort);
-    for (const branch of branches) {
-      yield* traverse(branch, node.number);
+    let pseudoLength = undefined;
+    if (!tree.isRoot(node) && pseudoParent === tree.getParent(node)) {
+      // the root will not have a parent
+      pseudoLength = tree.getLength(node);
+    } else {
+      if (pseudoParent !== undefined) {
+        pseudoLength = tree.getLength(pseudoParent);
+      }
+    }
+
+    yield {
+      ...tree.getNode(node.number),
+      pseudoLength,
+      pseudoChildren,
+      pseudoParent,
+    };
+
+    for (const someKid of pseudoChildren) {
+      yield* traverse(someKid, node.number);
     }
-    yield tree.getNode(node.number);
   };
 
   if (node === undefined) {
@@ -1251,6 +1320,63 @@ export function* psuedoRootPostOrderIterator(
   }
   yield* traverse(node);
 }
+
+// children order will matter but parents are always added after children
+export function* pseudoTipIterator(
+  tree: Tree,
+  node: NodeRef | undefined,
+  pseudoParent: NodeRef | undefined,
+): Generator<PseudoNode> {
+  const traverse = function* (
+    node: NodeRef,
+    visited: number | undefined = undefined,
+  ): Generator<PseudoNode> {
+    // get from tree so we keep proxy when used in draft
+    const branches = [...tree.getChildren(node)];
+    if (!tree.isRoot(node)) {
+      branches.push(tree.getParent(node));
+    }
+    // branches.sort((a,b)=>a.number-b.number)
+    const pseudoChildren = branches.filter((n) => n.number !== visited);
+    const pseudoParent = branches.find((node) => node.number === visited);
+    pseudoChildren.sort(
+      (a, b) =>
+        stableNodeNumber(tree, a, node) - stableNodeNumber(tree, b, node),
+    );
+    let pseudoLength = undefined;
+    if (!tree.isRoot(node) && pseudoParent === tree.getParent(node)) {
+      // the root will not have a parent
+      pseudoLength = tree.getLength(node);
+    } else {
+      if (pseudoParent !== undefined) {
+        pseudoLength = tree.getLength(pseudoParent);
+      }
+    }
+
+    if (pseudoChildren.length == 0) {
+      yield {
+        ...tree.getNode(node.number),
+        pseudoLength,
+        pseudoChildren,
+        pseudoParent,
+      };
+    } else {
+      for (const someKid of pseudoChildren) {
+        yield* traverse(someKid, node.number);
+      }
+    }
+  };
+
+  if (node === undefined) {
+    node = tree.getRoot();
+  }
+  if (pseudoParent !== undefined) {
+    yield* traverse(node, pseudoParent.number);
+  } else {
+    yield* traverse(node);
+  }
+}
+
 export function* postOrderIterator(
   tree: Tree,
   node: NodeRef | undefined = undefined,

package/src/layouts/functional/radial-layout.ts

@@ -1,5 +1,5 @@
 import type { ImmutableTree, NodeRef } from "../../evo";
-import { preOrderIterator, tipIterator } from "../../evo";
+import { pseudoTipIterator, psuedoRootPreOrderIterator } from "../../evo";
 import type { NodeLabelType } from "../types";
 import { notNull } from "../../utils/maybe";
 import type { FunctionalVertex } from "../types";
@@ -25,47 +25,63 @@ type data = {
 
 export function radialLayout(
   tree: ImmutableTree,
-  options: { spread?: number } = {},
+  options: { spread?: number; root?: NodeRef; startAngle?: number } = {},
 ): (node: NodeRef) => FunctionalVertex {
-  const { spread = 1 } = options;
+  const {
+    spread = 1,
+    root = tree.getRoot(),
+    startAngle = (2.5 * Math.PI) / 2,
+  } = options;
+
   console.log("radial layout with spread", spread);
   const map = new Map<NodeRef, FunctionalVertex>();
 
+  const fakeThroughRoot = tree.isRoot(root) && tree.getChildCount(root) == 2;
+
   const dataStack: data[] = [
     {
-      angleStart: 0,
-      angleEnd: 2 * Math.PI,
+      angleStart: startAngle,
+      angleEnd: startAngle + 2 * Math.PI,
       xpos: 0,
       ypos: 0,
       level: 0,
-      number: tree.getRoot().number,
+      number: root.number,
     },
   ]; // TODO start tree.
-  for (const node of preOrderIterator(tree)) {
+
+  for (const node of psuedoRootPreOrderIterator(tree, root)) {
     const data = dataStack.pop();
     notNull(data, `Internal Error, hit the end of the data stack unexpectedly`);
     const { angleStart, angleEnd, xpos, ypos, level } = data;
 
-    const branchAngle = (angleStart + angleEnd) / 2.0;
+    const branchAngle = (angleEnd + angleStart) / 2.0;
 
-    const length = !tree.isRoot(node) ? tree.getLength(node) : 0;
+    const length = node.pseudoLength !== undefined ? node.pseudoLength : 0;
 
     const directionX = Math.cos(branchAngle);
     const directionY = Math.sin(branchAngle);
     const x = xpos + length * directionX;
     const y = ypos + length * directionY;
 
-    const leftLabel = tree.getChildCount(node) > 0;
+    // we want to give the impression we are traversing from the root.
+    const directionalUpdate = tree.isRoot(tree.getNode(node.number))
+      ? 0
+      : node.pseudoParent === undefined ||
+          node.pseudoParent.number !== tree.getParent(node).number
+        ? -Math.PI
+        : 0;
+    const nTheta = normalizeAngle(branchAngle - directionalUpdate);
+
+    const leftLabel = node.pseudoChildren.length > 0;
     let dx, dy;
     if (!leftLabel) {
-      dx = Math.cos(branchAngle);
-      dy = Math.sin(branchAngle);
+      dx = Math.cos(nTheta);
+      dy = Math.sin(nTheta);
     } else {
-      dx = Math.cos(branchAngle);
-      dy = Math.sin(branchAngle);
+      dx = Math.cos(nTheta);
+      dy = Math.sin(nTheta);
     }
 
-    const nTheta = normalizeAngle(branchAngle);
     const vertex = {
       x,
       y,
@@ -81,11 +97,13 @@ export function radialLayout(
       } as NodeLabelType,
     };
 
-    if (tree.getChildCount(node) > 0) {
+    if (node.pseudoChildren.length > 0) {
       const childLeafs: number[] = [];
       let totalLeafs = 0;
-      for (let i = 0; i < tree.getChildCount(node); i++) {
-        const leafCount = [...tipIterator(tree, tree.getChild(node, i))].length;
+      for (let i = 0; i < node.pseudoChildren.length; i++) {
+        const leafCount = [
+          ...pseudoTipIterator(tree, node.pseudoChildren[i], node.pseudoParent),
+        ].length;
         childLeafs[i] = leafCount;
         totalLeafs += leafCount;
       }
@@ -93,15 +111,25 @@ export function radialLayout(
       let span = angleEnd - angleStart;
       let updatedAngleStart = angleStart;
 
-      if (tree.getRoot() !== node) {
+      // We don't want to adjust our path when we hit a degree 2 node or the root
+      // if we start at the root has 2 children. In that case we want the roo
+      // to sit on the middle of branch (even though it is really encoded as two branches)
+
+      if (node.pseudoChildren.length > 1) {
         // span *= 1.0 + ((safeOpts.spread * Math.PI / 180) / 10.0);
-        span *= 1.0 + (spread * Math.PI) / 180 / 10.0;
-        updatedAngleStart = branchAngle - span / 2.0;
+        console.log(fakeThroughRoot);
+        if (!fakeThroughRoot || !tree.isRoot(tree.getNode(node.number))) {
+          // this bumps the start angle so branches don't make a straight line.
+          // we want to inheret the open space from out parent, but also we want
+          // between 0 and 0.1 PI seem to be OK.
+          // this shoots for numbers between 0 and 100
+          span *= 1.0 + (spread / 1000) * Math.PI;
+          updatedAngleStart = branchAngle - span / 2.0;
+        }
       }
-
+      console.log("here");
       let a2 = updatedAngleStart;
-
-      for (let i = tree.getChildCount(node) - 1; i > -1; i--) {
+      for (let i = node.pseudoChildren.length - 1; i > -1; i--) {
         // i think we need to go in reverse order here
         const a1 = a2;
         a2 = a1 + (span * childLeafs[i]) / totalLeafs;
@@ -111,11 +139,11 @@ export function radialLayout(
           xpos: x,
           ypos: y,
           level: level + 1,
-          number: tree.getChild(node, i).number,
+          number: node.pseudoChildren[i].number,
         });
       }
     }
-    map.set(node, vertex);
+    map.set(tree.getNode(node.number), vertex);
   }
 
   return function (node: NodeRef): FunctionalVertex {

package/src/tests/baubles/__snapshots__/branch-labels.test.tsx.snap

@@ -469,25 +469,25 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
               class="branch-layer"
             >
               <path
-                d="M 303.9999492243224 284.97489210109876 C303.9999492243224,284.97489210109876 227.99989844864467,189.9497842021975 227.99989844864467,189.9497842021975 C227.99989844864467,189.9497842021975 189.9998730608058,142.43723025274684 170.99986036688637,118.68095327802152 C170.99986036688637,118.68095327802152 161.49985401992666,106.80281479065886 156.7498508464468,100.86374554697753 C156.7498508464468,100.86374554697753 154.37484925970688,97.89421092513686 153.1873484663369,96.40944361421654 C153.1873484663369,96.40944361421654 152.59359806965193,95.66705995875637 152.29672287130944,95.29586813102628 C152.29672287130944,95.29586813102628 151.99984767296695,94.92467630329621 151.99984767296695,94.92467630329621 "
+                d="M 306.5924779152444 95.03594795523999 C306.5924779152444,95.03594795523999 233.18495583048883,190.07189591047998 233.18495583048883,190.07189591047998 C233.18495583048883,190.07189591047998 196.48119478811105,237.5898698881 178.12931426692217,261.34885687690996 C178.12931426692217,261.34885687690996 168.95337400632775,273.22835037131495 164.36540387603054,279.1680971185175 C164.36540387603054,279.1680971185175 162.07141881088194,282.1379704921187 160.92442627830764,283.6229071789194 C160.92442627830764,283.6229071789194 160.35093001202046,284.3653755223197 160.06418187887687,284.7366096940199 C160.06418187887687,284.7366096940199 159.7774337457333,285.10784386572 159.7774337457333,285.10784386572 "
                 fill="none"
                 stroke="black"
                 stroke-width="2"
               />
               <path
-                d="M 151.99984767296695 94.92467630329621 C151.99984767296695,94.92467630329621 190.12010533393422,47.462338151648105 190.12010533393422,47.462338151648105 C190.12010533393422,47.462338151648105 209.18023416441787,23.731169075824052 218.71029857965968,11.865584537912026 C218.71029857965968,11.865584537912026 223.4753307872806,5.932792268956013 225.85784689109104,2.9663961344780065 C225.85784689109104,2.9663961344780065 227.04910494299628,1.4831980672390033 227.64473396894888,0.7415990336195016 C227.64473396894888,0.7415990336195016 227.9425484819252,0.3707995168097508 228.09145573841334,0.1853997584048754 C228.09145573841334,0.1853997584048754 228.2403629949015,0 228.2403629949015,0 "
+                d="M 159.7774337457333 285.10784386572 C159.7774337457333,285.10784386572 79.88871687286665,293.2946004927189 79.88871687286665,293.2946004927189 C79.88871687286665,293.2946004927189 39.944358436433326,297.38797880621837 19.972179218216663,299.4346679629681 C19.972179218216663,299.4346679629681 9.986089609108332,300.45801254134295 4.993044804554166,300.96968483053035 C4.993044804554166,300.96968483053035 2.496522402277083,301.2255209751241 1.2482612011385414,301.3534390474209 C1.2482612011385414,301.3534390474209 0.6241306005692707,301.41739808356937 0.31206530028463536,301.4493776016436 C0.31206530028463536,301.4493776016436 0,301.4813571197178 0,301.4813571197178 "
                 fill="none"
                 stroke="black"
                 stroke-width="2"
               />
               <path
-                d="M 151.99984767296695 94.92467630329621 C151.99984767296695,94.92467630329621 75.99992383648348,95.0249491830781 75.99992383648348,95.0249491830781 C75.99992383648348,95.0249491830781 37.99996191824174,95.07508562296906 18.99998095912087,95.10015384291452 C18.99998095912087,95.10015384291452 9.499990479560434,95.11268795288726 4.749995239780217,95.11895500787364 C4.749995239780217,95.11895500787364 2.3749976198901086,95.12208853536683 1.1874988099450543,95.12365529911341 C1.1874988099450543,95.12365529911341 0.5937494049725272,95.12443868098671 0.2968747024862636,95.12483037192337 C0.2968747024862636,95.12483037192337 0,95.12522206286 0,95.12522206286 "
+                d="M 159.7774337457333 285.10784386572 C159.7774337457333,285.10784386572 196.69432122862028,332.55392193286 196.69432122862028,332.55392193286 C196.69432122862028,332.55392193286 215.15276497006377,356.27696096643 224.38198684078552,368.138480483215 C224.38198684078552,368.138480483215 228.9965977761464,374.06924024160753 231.30390324382682,377.03462012080377 C231.30390324382682,377.03462012080377 232.45755597766703,378.5173100604019 233.03438234458713,379.25865503020094 C233.03438234458713,379.25865503020094 233.3227955280472,379.6293275151005 233.46700211977725,379.81466375755025 C233.46700211977725,379.81466375755025 233.61120871150726,380 233.61120871150726,380 "
                 fill="none"
                 stroke="black"
                 stroke-width="2"
               />
               <path
-                d="M 303.9999492243224 284.97489210109876 C303.9999492243224,284.97489210109876 341.99997461216117,332.48744605054935 341.99997461216117,332.48744605054935 C341.99997461216117,332.48744605054935 360.9999873060806,356.2437230252747 370.4999936530403,368.12186151263734 C370.4999936530403,368.12186151263734 375.24999682652015,374.06093075631867 377.6249984132601,377.0304653781593 C377.6249984132601,377.0304653781593 378.81249920663004,378.51523268907965 379.406249603315,379.2576163445398 C379.406249603315,379.2576163445398 379.7031248016575,379.62880817226994 379.85156240082875,379.81440408613497 C379.85156240082875,379.81440408613497 380,380 380,380 "
+                d="M 306.5924779152444 95.03594795523999 C306.5924779152444,95.03594795523999 343.2962389576222,47.517973977619995 343.2962389576222,47.517973977619995 C343.2962389576222,47.517973977619995 361.6481194788111,23.758986988809998 370.8240597394056,11.879493494404999 C370.8240597394056,11.879493494404999 375.4120298697028,5.939746747202499 377.7060149348514,2.9698733736012497 C377.7060149348514,2.9698733736012497 378.8530074674257,1.4849366868006248 379.4265037337128,0.7424683434003124 C379.4265037337128,0.7424683434003124 379.7132518668564,0.3712341717001562 379.8566259334282,0.1856170858500781 C379.8566259334282,0.1856170858500781 380,0 380,0 "
                 fill="none"
                 stroke="black"
                 stroke-width="2"
@@ -500,7 +500,7 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
                 <text
                   alignment-baseline="baseline"
                   text-anchor="middle"
-                  transform="translate(227.99989844864467,183.9497842021975) rotate(0)"
+                  transform="translate(233.18495583048883,184.07189591047998) rotate(0)"
                 >
                   Label!
                 </text>
@@ -509,7 +509,7 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
                 <text
                   alignment-baseline="baseline"
                   text-anchor="middle"
-                  transform="translate(190.12010533393422,41.462338151648105) rotate(0)"
+                  transform="translate(79.88871687286665,287.2946004927189) rotate(0)"
                 >
                   Label!
                 </text>
@@ -518,7 +518,7 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
                 <text
                   alignment-baseline="baseline"
                   text-anchor="middle"
-                  transform="translate(75.99992383648348,89.0249491830781) rotate(0)"
+                  transform="translate(196.69432122862028,326.55392193286) rotate(0)"
                 >
                   Label!
                 </text>
@@ -527,7 +527,7 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
                 <text
                   alignment-baseline="baseline"
                   text-anchor="middle"
-                  transform="translate(341.99997461216117,326.48744605054935) rotate(0)"
+                  transform="translate(343.2962389576222,41.517973977619995) rotate(0)"
                 >
                   Label!
                 </text>
@@ -553,25 +553,25 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
             class="branch-layer"
           >
             <path
-              d="M 303.9999492243224 284.97489210109876 C303.9999492243224,284.97489210109876 227.99989844864467,189.9497842021975 227.99989844864467,189.9497842021975 C227.99989844864467,189.9497842021975 189.9998730608058,142.43723025274684 170.99986036688637,118.68095327802152 C170.99986036688637,118.68095327802152 161.49985401992666,106.80281479065886 156.7498508464468,100.86374554697753 C156.7498508464468,100.86374554697753 154.37484925970688,97.89421092513686 153.1873484663369,96.40944361421654 C153.1873484663369,96.40944361421654 152.59359806965193,95.66705995875637 152.29672287130944,95.29586813102628 C152.29672287130944,95.29586813102628 151.99984767296695,94.92467630329621 151.99984767296695,94.92467630329621 "
+              d="M 306.5924779152444 95.03594795523999 C306.5924779152444,95.03594795523999 233.18495583048883,190.07189591047998 233.18495583048883,190.07189591047998 C233.18495583048883,190.07189591047998 196.48119478811105,237.5898698881 178.12931426692217,261.34885687690996 C178.12931426692217,261.34885687690996 168.95337400632775,273.22835037131495 164.36540387603054,279.1680971185175 C164.36540387603054,279.1680971185175 162.07141881088194,282.1379704921187 160.92442627830764,283.6229071789194 C160.92442627830764,283.6229071789194 160.35093001202046,284.3653755223197 160.06418187887687,284.7366096940199 C160.06418187887687,284.7366096940199 159.7774337457333,285.10784386572 159.7774337457333,285.10784386572 "
               fill="none"
               stroke="black"
               stroke-width="2"
             />
             <path
-              d="M 151.99984767296695 94.92467630329621 C151.99984767296695,94.92467630329621 190.12010533393422,47.462338151648105 190.12010533393422,47.462338151648105 C190.12010533393422,47.462338151648105 209.18023416441787,23.731169075824052 218.71029857965968,11.865584537912026 C218.71029857965968,11.865584537912026 223.4753307872806,5.932792268956013 225.85784689109104,2.9663961344780065 C225.85784689109104,2.9663961344780065 227.04910494299628,1.4831980672390033 227.64473396894888,0.7415990336195016 C227.64473396894888,0.7415990336195016 227.9425484819252,0.3707995168097508 228.09145573841334,0.1853997584048754 C228.09145573841334,0.1853997584048754 228.2403629949015,0 228.2403629949015,0 "
+              d="M 159.7774337457333 285.10784386572 C159.7774337457333,285.10784386572 79.88871687286665,293.2946004927189 79.88871687286665,293.2946004927189 C79.88871687286665,293.2946004927189 39.944358436433326,297.38797880621837 19.972179218216663,299.4346679629681 C19.972179218216663,299.4346679629681 9.986089609108332,300.45801254134295 4.993044804554166,300.96968483053035 C4.993044804554166,300.96968483053035 2.496522402277083,301.2255209751241 1.2482612011385414,301.3534390474209 C1.2482612011385414,301.3534390474209 0.6241306005692707,301.41739808356937 0.31206530028463536,301.4493776016436 C0.31206530028463536,301.4493776016436 0,301.4813571197178 0,301.4813571197178 "
               fill="none"
               stroke="black"
               stroke-width="2"
             />
             <path
-              d="M 151.99984767296695 94.92467630329621 C151.99984767296695,94.92467630329621 75.99992383648348,95.0249491830781 75.99992383648348,95.0249491830781 C75.99992383648348,95.0249491830781 37.99996191824174,95.07508562296906 18.99998095912087,95.10015384291452 C18.99998095912087,95.10015384291452 9.499990479560434,95.11268795288726 4.749995239780217,95.11895500787364 C4.749995239780217,95.11895500787364 2.3749976198901086,95.12208853536683 1.1874988099450543,95.12365529911341 C1.1874988099450543,95.12365529911341 0.5937494049725272,95.12443868098671 0.2968747024862636,95.12483037192337 C0.2968747024862636,95.12483037192337 0,95.12522206286 0,95.12522206286 "
+              d="M 159.7774337457333 285.10784386572 C159.7774337457333,285.10784386572 196.69432122862028,332.55392193286 196.69432122862028,332.55392193286 C196.69432122862028,332.55392193286 215.15276497006377,356.27696096643 224.38198684078552,368.138480483215 C224.38198684078552,368.138480483215 228.9965977761464,374.06924024160753 231.30390324382682,377.03462012080377 C231.30390324382682,377.03462012080377 232.45755597766703,378.5173100604019 233.03438234458713,379.25865503020094 C233.03438234458713,379.25865503020094 233.3227955280472,379.6293275151005 233.46700211977725,379.81466375755025 C233.46700211977725,379.81466375755025 233.61120871150726,380 233.61120871150726,380 "
               fill="none"
               stroke="black"
               stroke-width="2"
             />
             <path
-              d="M 303.9999492243224 284.97489210109876 C303.9999492243224,284.97489210109876 341.99997461216117,332.48744605054935 341.99997461216117,332.48744605054935 C341.99997461216117,332.48744605054935 360.9999873060806,356.2437230252747 370.4999936530403,368.12186151263734 C370.4999936530403,368.12186151263734 375.24999682652015,374.06093075631867 377.6249984132601,377.0304653781593 C377.6249984132601,377.0304653781593 378.81249920663004,378.51523268907965 379.406249603315,379.2576163445398 C379.406249603315,379.2576163445398 379.7031248016575,379.62880817226994 379.85156240082875,379.81440408613497 C379.85156240082875,379.81440408613497 380,380 380,380 "
+              d="M 306.5924779152444 95.03594795523999 C306.5924779152444,95.03594795523999 343.2962389576222,47.517973977619995 343.2962389576222,47.517973977619995 C343.2962389576222,47.517973977619995 361.6481194788111,23.758986988809998 370.8240597394056,11.879493494404999 C370.8240597394056,11.879493494404999 375.4120298697028,5.939746747202499 377.7060149348514,2.9698733736012497 C377.7060149348514,2.9698733736012497 378.8530074674257,1.4849366868006248 379.4265037337128,0.7424683434003124 C379.4265037337128,0.7424683434003124 379.7132518668564,0.3712341717001562 379.8566259334282,0.1856170858500781 C379.8566259334282,0.1856170858500781 380,0 380,0 "
               fill="none"
               stroke="black"
               stroke-width="2"
@@ -584,7 +584,7 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
               <text
                 alignment-baseline="baseline"
                 text-anchor="middle"
-                transform="translate(227.99989844864467,183.9497842021975) rotate(0)"
+                transform="translate(233.18495583048883,184.07189591047998) rotate(0)"
               >
                 Label!
               </text>
@@ -593,7 +593,7 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
               <text
                 alignment-baseline="baseline"
                 text-anchor="middle"
-                transform="translate(190.12010533393422,41.462338151648105) rotate(0)"
+                transform="translate(79.88871687286665,287.2946004927189) rotate(0)"
               >
                 Label!
               </text>
@@ -602,7 +602,7 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
               <text
                 alignment-baseline="baseline"
                 text-anchor="middle"
-                transform="translate(75.99992383648348,89.0249491830781) rotate(0)"
+                transform="translate(196.69432122862028,326.55392193286) rotate(0)"
               >
                 Label!
               </text>
@@ -611,7 +611,7 @@ exports[`Branch labels > renders a tree node labels in radial layout 1`] = `
               <text
                 alignment-baseline="baseline"
                 text-anchor="middle"
-                transform="translate(341.99997461216117,326.48744605054935) rotate(0)"
+                transform="translate(343.2962389576222,41.517973977619995) rotate(0)"
               >
                 Label!
               </text>