flo-mat 3.0.0 → 3.0.2

package/node/debug/functions/draw-elem/draw-mat.js

@@ -0,0 +1,38 @@
+import { drawFs } from 'flo-draw';
+import { traverseEdges } from '../../../cp-node/fs/traverse-edges.js';
+import { getMatCurveToNext } from '../../../cp-node/fs/get-mat-curve-to-next.js';
+import { CpNodeFs } from '../../../cp-node/cp-node-fs.js';
+const { isTerminating } = CpNodeFs;
+const altClasses = [
+    'thin10 blue nofill',
+    'thin10 red nofill'
+];
+/** @internal */
+/*async */ function drawMat(g, mat, classes_, delay = 0, scaleFactor = 1) {
+    let cpNode = mat.cpNode;
+    if (!cpNode) {
+        return [];
+    }
+    while (!isTerminating(cpNode)) {
+        cpNode = cpNode.next;
+    }
+    const $svgs = [];
+    let i = 0;
+    traverseEdges(cpNode, async (cpNode) => {
+        // await sleep(50);
+        if (isTerminating(cpNode)) {
+            return;
+        }
+        const bezier = getMatCurveToNext(cpNode);
+        if (!bezier) {
+            return;
+        }
+        $svgs.push(...drawFs.bezier(g, bezier, altClasses[i % 2], delay));
+        i++;
+    });
+    return $svgs;
+}
+function drawCurve() {
+}
+export { drawMat };
+//# sourceMappingURL=draw-mat.js.map

package/node/debug/functions/draw-elem/draw-mat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-mat.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-mat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAkB,aAAa,EAAmB,MAAM,uCAAuC,CAAC;AACvG,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAI1D,MAAM,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;AAGnC,MAAM,UAAU,GAAG;IACf,oBAAoB;IACpB,mBAAmB;CACtB,CAAC;AAEF,gBAAgB;AAChB,UAAU,CAAA,SAAS,OAAO,CAClB,CAAc,EACd,GAAQ,EACR,QAAiB,EACjB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IACxB,IAAI,CAAC,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IAE3B,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IAAC,CAAC;IAExD,MAAM,KAAK,GAAiB,EAAE,CAAC;IAE/B,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,aAAa,CAAC,MAAM,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;QACjC,mBAAmB;QACnB,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAEtC,MAAM,MAAM,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,MAAM,EAAE,CAAC;YAAC,OAAO;QAAC,CAAC;QAExB,KAAK,CAAC,IAAI,CAAE,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,GAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACjE,CAAC,EAAE,CAAC;IACR,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACjB,CAAC;AAGD,SAAS,SAAS;AAElB,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAA"}

package/node/debug/functions/draw-elem/{max-vertex.js → draw-max-vertex.js}

@@ -6,4 +6,4 @@ function maxVertex(g, cpNode) {
     return $elems;
 }
 export { maxVertex };
-//# sourceMappingURL=max-vertex.js.map
+//# sourceMappingURL=draw-max-vertex.js.map

package/node/debug/functions/draw-elem/draw-max-vertex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-max-vertex.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-max-vertex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,gBAAgB;AAChB,SAAS,SAAS,CAAC,CAAc,EAAE,MAAc;IAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC;IAEhC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAElE,OAAO,MAAM,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/node/debug/functions/draw-elem/{min-y.js → draw-min-y.js}

@@ -7,4 +7,4 @@ function minY(g, pos) {
     return $elems;
 }
 export { minY };
-//# sourceMappingURL=min-y.js.map
+//# sourceMappingURL=draw-min-y.js.map

package/node/debug/functions/draw-elem/draw-min-y.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-min-y.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-min-y.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,eAAe,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,gBAAgB;AAChB,SAAS,IAAI,CAAC,CAAc,EAAE,GAAiB;IAC3C,MAAM,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAE/C,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CACvB,CAAC,EAAE,CAAC,EAAE,mBAAmB,CACnC,CAAC;IAEC,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,IAAI,EAAE,CAAA"}

package/node/debug/functions/draw-elem/{one-prong-at-dull-corner.js → draw-one-prong-at-dull-corner.js}

@@ -10,4 +10,4 @@ function oneProngAtDullCorner(g, pos, classes, delay = 1000, scaleFactor = 1) {
     return [...$center, ...$circle, ...$pos];
 }
 export { oneProngAtDullCorner };
-//# sourceMappingURL=one-prong-at-dull-corner.js.map
+//# sourceMappingURL=draw-one-prong-at-dull-corner.js.map

package/node/debug/functions/draw-elem/draw-one-prong-at-dull-corner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-one-prong-at-dull-corner.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-one-prong-at-dull-corner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AAGvF,cAAc;AACd,SAAS,oBAAoB,CACrB,CAAc,EACd,GAAiB,EACjB,OAAgB,EAChB,KAAK,GAAG,IAAI,EACZ,WAAW,GAAG,CAAC;IAEnB,gFAAgF;IAChF,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;IAEnE,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAErE,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;AAC1C,CAAC;AAGD,OAAO,EAAE,oBAAoB,EAAE,CAAA"}

package/node/debug/functions/draw-elem/{one-prong.js → draw-one-prong.js}

@@ -9,4 +9,4 @@ function drawOneProng(g, cpNodes, classes, delay = 0, scaleFactor = 1) {
     return [...$center, ...$circle, ...$pos];
 }
 export { drawOneProng };
-//# sourceMappingURL=one-prong.js.map
+//# sourceMappingURL=draw-one-prong.js.map

package/node/debug/functions/draw-elem/draw-one-prong.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-one-prong.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-one-prong.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,cAAc;AACd,SAAS,YAAY,CACb,CAAc,EACd,OAAiB,EACjB,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IACzC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,GAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;IAClF,MAAM,IAAI,GAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,KAAK,CAAC,CAAC;IAE5E,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;AAC1C,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/node/debug/functions/draw-elem/{sharp-corner.js → draw-sharp-corner.js}

@@ -6,4 +6,4 @@ function sharpCorner(g, curve, classes = 'green', delay = 0, scaleFactor = 1) {
     return $pos;
 }
 export { sharpCorner };
-//# sourceMappingURL=sharp-corner.js.map
+//# sourceMappingURL=draw-sharp-corner.js.map

package/node/debug/functions/draw-elem/draw-sharp-corner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-sharp-corner.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-sharp-corner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,gBAAgB;AAChB,SAAS,WAAW,CAClB,CAAc,EACd,KAAY,EACN,OAAO,GAAG,OAAO,EACjB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEtB,MAAM,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,GAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAE/D,OAAO,IAAI,CAAC;AACb,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/node/debug/functions/draw-elem/draw-speed.d.ts

@@ -0,0 +1,4 @@
+import { CpNode } from '../../../cp-node/cp-node.js';
+/** @internal */
+declare function drawSpeed(g: SVGGElement, cpNode: CpNode, classes_?: string, delay?: number, scaleFactor?: number): SVGElement[];
+export { drawSpeed };

package/node/debug/functions/draw-elem/draw-speed.js

@@ -0,0 +1,21 @@
+import { normal } from 'flo-bezier3';
+import { drawFs } from 'flo-draw';
+import { toLength, translate } from 'flo-vector2d';
+import { getSmoothedSpeed$ } from '../../../cp-node/fs/get-smoothed-speed.js';
+/** @internal */
+function drawSpeed(g, cpNode, classes_, delay = 0, scaleFactor = 1) {
+    const $elems = [];
+    const s = getSmoothedSpeed$(0)(cpNode);
+    if (s === undefined) {
+        return [];
+    }
+    const pos = cpNode.cp.pointOnShape;
+    const { p, t } = pos;
+    const ps = pos.curve.ps;
+    const ss = s * scaleFactor / 8;
+    const n = toLength(normal(ps, t), ss);
+    $elems.push(...drawFs.line(g, [p, translate(p, n)], 'red thin5', delay));
+    return $elems;
+}
+export { drawSpeed };
+//# sourceMappingURL=draw-speed.js.map

package/node/debug/functions/draw-elem/draw-speed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-speed.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-speed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAG9E,gBAAgB;AAChB,SAAS,SAAS,CACV,CAAc,EACd,MAAc,EACd,QAAiB,EACjB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAiB,EAAE,CAAC;IAEhC,MAAM,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAEvC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,EAAE,CAAC;IAAC,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC;IACnC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;IACrB,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;IAExB,MAAM,EAAE,GAAG,CAAC,GAAC,WAAW,GAAC,CAAC,CAAC;IAE3B,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACrC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAC,SAAS,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IAE1E,OAAO,MAAM,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/node/debug/functions/draw-elem/draw-three-prong.d.ts

@@ -0,0 +1,4 @@
+import { CpNode } from '../../../cp-node/cp-node.js';
+/** @internal */
+declare function drawThreeProng(g: SVGGElement, threeProng: CpNode, classes?: string, delay?: number, scaleFactor?: number): SVGElement[];
+export { drawThreeProng };

package/node/debug/functions/draw-elem/draw-three-prong.js

@@ -0,0 +1,26 @@
+import { drawFs } from 'flo-draw';
+import { scaleCircle } from '../../../geometry/circle.js';
+import { CpNodeFs } from '../../../cp-node/cp-node-fs.js';
+/** @internal */
+function drawThreeProng(g, 
+// threeProng: ThreeProngForDebugging,
+threeProng, classes, delay = 0, scaleFactor = 1) {
+    const circle = scaleCircle(threeProng.cp.circle, 1);
+    const { center: c, radius: r } = circle;
+    // const poss = threeProng.poss;
+    const poss = CpNodeFs.getAllOnCircle(threeProng)
+        .map(cpNode => cpNode.cp.pointOnShape);
+    const { dot, circle: drawCircle, crossHair } = drawFs;
+    const $circle = drawCircle(g, circle, 'blue thin2 nofill', delay);
+    const $cps = [];
+    const $ls = [];
+    for (let i = 0; i < poss.length; i++) {
+        const p = poss[i].p;
+        $cps.push(...dot(g, p, 0.01 * (i + 1) * scaleFactor, 'blue', delay));
+        $ls.push(...drawFs.line(g, [p, c], 'thin5 red', delay));
+    }
+    const $cross = crossHair(g, circle.center, 'red thin2 nofill', 0.02 * scaleFactor, delay);
+    return [...$cps, ...$ls, ...$circle, ...$cross];
+}
+export { drawThreeProng };
+//# sourceMappingURL=draw-three-prong.js.map

package/node/debug/functions/draw-elem/draw-three-prong.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-three-prong.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-three-prong.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAG1D,gBAAgB;AAChB,SAAS,cAAc,CACrB,CAAc;AACd,sCAAsC;AACtC,UAAkB,EAClB,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEhB,MAAM,MAAM,GAAG,WAAW,CACzB,UAAU,CAAC,EAAE,CAAC,MAAM,EACpB,CAAC,CACD,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;IAExC,gCAAgC;IAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC;SACxC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAA;IAE7C,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAEtD,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,CAAC,CAAC;IAElE,MAAM,IAAI,GAAiB,EAAE,CAAC;IAC9B,MAAM,GAAG,GAAiB,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,GAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/D,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,GAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAExF,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,MAAM,CAAiB,CAAC;AACjE,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/node/debug/functions/draw-elem/{tight-bounding-box.js → draw-tight-bounding-box.js}

@@ -5,4 +5,4 @@ function tightBoundingBox(g, box, classes = 'thin5 pinker nofill', delay = 0, sc
     return $box;
 }
 export { tightBoundingBox };
-//# sourceMappingURL=tight-bounding-box.js.map
+//# sourceMappingURL=draw-tight-bounding-box.js.map

package/node/debug/functions/draw-elem/draw-tight-bounding-box.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-tight-bounding-box.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-tight-bounding-box.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,gBAAgB;AAChB,SAAS,gBAAgB,CACvB,CAAc,EACd,GAAe,EACT,OAAO,GAAG,qBAAqB,EAC/B,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEtB,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,KAAK,CAAC,CAAC;IAElE,OAAO,IAAI,CAAC;AACb,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/debug/functions/draw-elem/draw-two-prong.d.ts

@@ -0,0 +1,4 @@
+import { CpNode } from '../../../cp-node/cp-node.js';
+/** @internal */
+declare function drawTwoProng(drawCrosshair: boolean, drawSpokes: boolean): (g: SVGGElement, twoProng: CpNode, classes?: string, delay?: number, scaleFactor?: number) => SVGElement[];
+export { drawTwoProng };

package/node/debug/functions/draw-elem/draw-two-prong.js

@@ -0,0 +1,48 @@
+import { drawFs } from 'flo-draw';
+/** @internal */
+function drawTwoProng(drawCrosshair, drawSpokes) {
+    return (g, twoProng, classes, delay = 0, scaleFactor = 1) => {
+        let color;
+        let thin;
+        switch (twoProng.isHoleClosing) {
+            case false: {
+                color = 'red ';
+                thin = '2';
+                break;
+            }
+            case true: {
+                color = 'cyan ';
+                thin = '10';
+                break;
+            }
+        }
+        const cp = twoProng.cp;
+        const { circle, pointOnShape: pos } = cp;
+        const { center: c, radius: r } = circle;
+        const { isSource, p } = pos;
+        const p2 = twoProng.nextOnCircle.cp.pointOnShape.p;
+        const pS = isSource ? p : p2;
+        const pA = isSource ? p2 : p;
+        const { line, dot, circle: drawCircle, crossHair } = drawFs;
+        const $center = dot(g, circle.center, 0.02 * scaleFactor, 'yellow', delay);
+        const $circle = drawCircle(g, circle, color + 'thin' + thin + ' nofill', delay);
+        const $cp1 = dot(g, pS, 0.005 * scaleFactor, color, delay);
+        const $cp2 = dot(g, pA, 0.01 * scaleFactor, color, delay);
+        // const $l1 = drawSpokes ? line(g, [pS, c], 'thin5 red nofill', delay) : [];
+        // const $l2 = drawSpokes ? line(g, [pA, c], 'thin5 red nofill', delay) : [];
+        const $cross = drawCrosshair
+            ? crossHair(g, circle.center, 'red thin2 nofill', 0.002 * scaleFactor, delay)
+            : [];
+        return [
+            ...$circle,
+            ...$cp1,
+            ...$cp2,
+            // ...$l1,
+            // ...$l2,
+            ...$cross,
+            ...$center
+        ];
+    };
+}
+export { drawTwoProng };
+//# sourceMappingURL=draw-two-prong.js.map

package/node/debug/functions/draw-elem/draw-two-prong.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-two-prong.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-two-prong.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,gBAAgB;AAChB,SAAS,YAAY,CACnB,aAAsB,EACtB,UAAmB;IAEpB,OAAO,CAAC,CAAc,EACpB,QAAgB,EAChB,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC,EAAE,EAAE;QAEpB,IAAI,KAAK,CAAC;QACV,IAAI,IAAI,CAAC;QAET,QAAQ,QAAQ,CAAC,aAAa,EAAE,CAAC;YAChC,KAAK,KAAK,CAAC,CAAC,CAAC;gBACZ,KAAK,GAAG,MAAM,CAAC;gBACf,IAAI,GAAG,GAAG,CAAC;gBACX,MAAM;YACP,CAAC;YACD,KAAK,IAAI,CAAC,CAAC,CAAC;gBACX,KAAK,GAAG,OAAO,CAAC;gBAChB,IAAI,GAAG,IAAI,CAAC;gBACZ,MAAM;YACP,CAAC;QACF,CAAC;QAED,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACvB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACzC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;QACxC,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;QAC5B,MAAM,EAAE,GAAG,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;QACnD,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAE7B,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAE5D,MAAM,OAAO,GAAG,GAAG,CAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,KAAK,CAAC,CAAC;QAChF,MAAM,IAAI,GAAM,GAAG,CAAI,CAAC,EAAE,EAAE,EAAE,KAAK,GAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAM,GAAG,CAAI,CAAC,EAAE,EAAE,EAAE,IAAI,GAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAE9D,6EAA6E;QAC7E,6EAA6E;QAE7E,MAAM,MAAM,GAAG,aAAa;YAC3B,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,GAAC,WAAW,EAAE,KAAK,CAAC;YAC3E,CAAC,CAAC,EAAE,CAAC;QAEN,OAAO;YACN,GAAG,OAAO;YACV,GAAG,IAAI;YACP,GAAG,IAAI;YACP,UAAU;YACV,UAAU;YACV,GAAG,MAAM;YACT,GAAG,OAAO;SACV,CAAC;IACH,CAAC,CAAA;AACF,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/node/debug/functions/draw-elem/{vertex.d.ts → draw-vertex.d.ts}

@@ -1,5 +1,4 @@
 import { CpNode } from '../../../cp-node/cp-node.js';
 /** @internal */
-declare function vertex(g: SVGGElement, cpNode: CpNode, classes?: string, delay?: number, /*
-visible = true*/ scaleFactor?: number): SVGElement[];
+declare function vertex(g: SVGGElement, cpNode: CpNode, classes?: string, delay?: number, scaleFactor?: number): SVGElement[];
 export { vertex };

package/node/debug/functions/draw-elem/draw-vertex.js

@@ -0,0 +1,15 @@
+import { drawFs } from 'flo-draw';
+import { CpNodeFs } from '../../../cp-node/cp-node-fs.js';
+const { getAllOnCircle } = CpNodeFs;
+/** @internal */
+function vertex(g, cpNode, classes, delay = 0, scaleFactor = 1) {
+    const circle = cpNode.cp.circle;
+    let $svgs = [];
+    // const $circle = drawFs.circle(g, circle, 'red ' + THIN + ' nofill ', delay);
+    // const $crossHair = drawFs.crossHair(g, circle.center, 'red ' + THIN + ' nofill ', 3, delay);
+    const $dot = drawFs.dot(g, circle.center, 0.01 * scaleFactor, 'darkgreen', delay);
+    $svgs = [...$dot];
+    return $svgs;
+}
+export { vertex };
+//# sourceMappingURL=draw-vertex.js.map

package/node/debug/functions/draw-elem/draw-vertex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"draw-vertex.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-vertex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC;AAGpC,gBAAgB;AAChB,SAAS,MAAM,CACb,CAAc,EACd,MAAc,EACd,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEhB,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC;IAEhC,IAAI,KAAK,GAAiB,EAAE,CAAC;IAE7B,+EAA+E;IAC/E,+FAA+F;IAC/F,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;IAEhF,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAElB,OAAO,KAAK,CAAC;AACd,CAAC;AAGD,OAAO,EAAE,MAAM,EAAE,CAAA"}

package/node/find-2-prong/add-1-prong.d.ts

@@ -1,12 +1,10 @@
-import { LlRbTree } from 'flo-ll-rb-tree';
-import { Loop } from 'flo-boolean';
-import { CpNode } from '../cp-node/cp-node.js';
 import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { MatMeta } from '../mat/mat-meta.js';
 /**
  * @hidden
  * Add a 1-prong to the MAT.
- * @param cpGraphs
+ * @param cpTrees
  * @param pos
  */
-declare function add1Prong(radius: number, center: number[], cpGraphs: Map<Loop, LlRbTree<CpNode>>, pos: PointOnShape): void;
+declare function add1Prong(meta: MatMeta, radius: number, center: number[], pos: PointOnShape): void;
 export { add1Prong };

package/node/find-2-prong/add-1-prong.js

@@ -1,16 +1,16 @@
-import { addToCpGraph } from '../mat/add-to-cp-graph.js';
-import { isAnotherCpCloseby } from '../mat/is-another-cp-closeby.js';
-import { isPosDullCorner } from '../point-on-shape/is-pos-dull-corner.js';
+import { addToCpTree } from '../mat/add-to-cp-tree.js';
+import { getCloseByCpIfExist } from '../mat/get-closeby-cp-if-exist.js';
 import { calcPosOrder } from '../point-on-shape/calc-pos-order.js';
+import { isPosCorner } from '../point-on-shape/is-pos-corner.js';
+import { getPosCorner } from '../point-on-shape/get-pos-corner.js';
 /**
  * @hidden
  * Add a 1-prong to the MAT.
- * @param cpGraphs
+ * @param cpTrees
  * @param pos
  */
-function add1Prong(radius, center, cpGraphs, pos) {
-    //if (PointOnShape.isDullCorner(pos)) {
-    if (isPosDullCorner(pos)) {
+function add1Prong(meta, radius, center, pos) {
+    if (isPosCorner(pos) && getPosCorner(pos).isDull) {
         // This is a 1-prong at a dull corner.
         // TODO IMPORTANT 
         // Remove this line, uncomment piece below it and implement the 
@@ -21,23 +21,22 @@ function add1Prong(radius, center, cpGraphs, pos) {
         // terminal points are found, e.g. zoom in on top left leg of ant.
         // Afterthought: there is a better way - split points by two prongs.
         //toRemove.push(posNode); // this!
-        if (typeof _debug_ !== 'undefined') {
-            // _debug_.generated.elems.oneProngAtDullCorner.push(pos);
-        }
+        // if (typeof _debug_ !== 'undefined') { 
+        // _debug_.generated.elems.oneProngAtDullCorner.push(pos);
+        // }
         return;
     }
-    // const circle = getOsculatingCircle(maxOsculatingCircleRadius, pos);
     const circle = { radius, center };
     const order = calcPosOrder(circle, pos);
     // Make sure there isn't already a ContactPoint close by - it can cause
     // floating point stability issues.
-    if (isAnotherCpCloseby(cpGraphs, pos, circle, order, 0, 1000)) {
+    if (getCloseByCpIfExist(meta, pos, circle, order, 0, 1)) {
         return;
     }
-    const cpNodes = addToCpGraph(circle, [-0.5, +0.5], cpGraphs, [pos, pos]);
-    if (typeof _debug_ !== 'undefined') {
-        _debug_.generated.elems.oneProng.push(cpNodes);
-    }
+    const { anyFailed, cpNodes } = addToCpTree(false, false, circle, [-0.5, +0.5], meta.cpTrees, [pos, pos]);
+    // if (typeof _debug_ !== 'undefined') { 
+    //     _debug_.generated.elems.oneProng.push(cpNodes);
+    // }
 }
 export { add1Prong };
 //# sourceMappingURL=add-1-prong.js.map

package/node/find-2-prong/add-1-prong.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-1-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/add-1-prong.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAInE;;;;;GAKG;AACH,SAAS,SAAS,CAChB,MAAc,EACR,MAAgB,EAChB,QAAoC,EACpC,GAAiB;IAExB,uCAAuC;IACpC,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE;QAC5B,sCAAsC;QAEtC,kBAAkB;QAClB,gEAAgE;QAChE,wEAAwE;QACxE,mEAAmE;QACnE,mEAAmE;QACnE,qEAAqE;QAC/D,kEAAkE;QAClE,oEAAoE;QAE1E,kCAAkC;QAElC,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;YAC1B,0DAA0D;SAC7D;QAEP,OAAO;KACP;IAED,sEAAsE;IACnE,MAAM,MAAM,GAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAE7C,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxC,uEAAuE;IACvE,mCAAmC;IACnC,IAAI,kBAAkB,CAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE;QAC9D,OAAO;KACP;IAEE,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE5E,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE;QAC7B,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KAClD;AACL,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"add-1-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/add-1-prong.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE;;;;;GAKG;AACH,SAAS,SAAS,CAChB,IAAa,EACb,MAAc,EACR,MAAgB,EAChB,GAAiB;IAErB,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;QACrD,sCAAsC;QAEtC,kBAAkB;QAClB,gEAAgE;QAChE,wEAAwE;QACxE,mEAAmE;QACnE,mEAAmE;QACnE,qEAAqE;QAC/D,kEAAkE;QAClE,oEAAoE;QAE1E,kCAAkC;QAElC,yCAAyC;QAC/B,0DAA0D;QAC9D,IAAI;QAEV,OAAO;IACR,CAAC;IAEE,MAAM,MAAM,GAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAE7C,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACxC,uEAAuE;IACvE,mCAAmC;IACnC,IAAI,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACzD,OAAO;IACR,CAAC;IAEE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAE5G,yCAAyC;IACtC,sDAAsD;IACtD,IAAI;AACR,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/node/find-2-prong/add-2-prong.d.ts

@@ -1,18 +1,18 @@
-import { LlRbTree } from 'flo-ll-rb-tree';
-import { Loop } from 'flo-boolean';
 import { CpNode } from '../cp-node/cp-node.js';
 import { Circle } from '../geometry/circle.js';
 import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { MatMeta } from '../mat/mat-meta.js';
 /**
  * @internal
  * Adds a 2-prong contact circle to the shape.
- * @param cpGraphs
+ *
+ * @param cpTrees
  * @param circle Circle containing the 2 contact points
  * @param posSource The source point on shape
  * @param posAntipode The found antipodal point on shape
- * @param holeClosing True if this is a hole-closing 2-prong, false otherwise
- * @param extreme The maximum coordinate value used to calculate floating point
+ * @param isHoleClosing True if this is a hole-closing 2-prong, false otherwise
+ * @param maxCoordinate The maximum coordinate value used to calculate floating point
  * tolerances.
  */
-declare function add2Prong(cpGraphs: Map<Loop, LlRbTree<CpNode>>, circle: Circle, posSource: PointOnShape, posAntipodes: PointOnShape[], holeClosing: boolean, extreme: number): CpNode | undefined;
+declare function add2Prong(meta: MatMeta, circle: Circle, poss: PointOnShape[], isHoleClosing: boolean): CpNode | undefined;
 export { add2Prong };

package/node/find-2-prong/add-2-prong.js

@@ -1,145 +1,66 @@
-import { insertCpNode } from '../cp-node/cp-node.js';
 import { calcPosOrder } from '../point-on-shape/calc-pos-order.js';
 import { createPos } from '../point-on-shape/create-pos.js';
-import { isAnotherCpCloseby } from '../mat/is-another-cp-closeby.js';
-import { getNeighbouringPoints } from '../mat/get-neighboring-cps.js';
+import { getCloseByCpIfExist } from '../mat/get-closeby-cp-if-exist.js';
+import { insertCpNode } from '../cp-node/fs/insert-cp-node.js';
+import { addToCpTree } from '../mat/add-to-cp-tree.js';
+import { removeCpNode } from '../cp-node/fs/remove-cp-node.js';
 /**
  * @internal
  * Adds a 2-prong contact circle to the shape.
- * @param cpGraphs
+ *
+ * @param cpTrees
  * @param circle Circle containing the 2 contact points
  * @param posSource The source point on shape
  * @param posAntipode The found antipodal point on shape
- * @param holeClosing True if this is a hole-closing 2-prong, false otherwise
- * @param extreme The maximum coordinate value used to calculate floating point
+ * @param isHoleClosing True if this is a hole-closing 2-prong, false otherwise
+ * @param maxCoordinate The maximum coordinate value used to calculate floating point
  * tolerances.
  */
-function add2Prong(cpGraphs, circle, posSource, posAntipodes, holeClosing, extreme) {
-    let t_s = posSource.t;
-    if (t_s === 0) {
-        t_s = 1;
-        posSource = createPos(posSource.curve.prev, t_s, true);
-    }
-    const orderSource = calcPosOrder(circle, posSource);
-    const orderAntipodes = posAntipodes.map(posAntipode => calcPosOrder(circle, posAntipode));
+function add2Prong(meta, circle, poss, isHoleClosing) {
+    const { cpTrees } = meta;
+    poss[0] = poss[0].t === 0
+        ? createPos(poss[0].curve.prev, 1, true)
+        : poss[0];
+    const orders = poss.map(pos => calcPosOrder(circle, pos));
     // Make sure there isn't already a ContactPoint close by - it can cause
     // floating point stability issues.
-    let isCloseByAntipodes = false;
-    for (let i = 0; i < posAntipodes.length; i++) {
-        const posAntipode = posAntipodes[i];
-        const orderAntipode = orderAntipodes[i];
-        if (!!isAnotherCpCloseby(cpGraphs, posAntipode, circle, orderAntipode, 0, extreme)) {
-            isCloseByAntipodes = true;
-            break;
+    for (let i = 0; i < poss.length; i++) {
+        if (!!getCloseByCpIfExist(meta, poss[i], circle, orders[i], 0, 2)) {
+            return undefined;
         }
     }
-    if (!!isAnotherCpCloseby(cpGraphs, posSource, circle, orderSource, 0, extreme) ||
-        isCloseByAntipodes) {
-        if (typeof _debug_ !== 'undefined') {
-            if (holeClosing) {
-                _debug_.generated.elems['twoProng_holeClosing'].pop();
-            }
-            else {
-                _debug_.generated.elems['twoProng_regular'].pop();
+    const { anyFailed, cpNodes } = addToCpTree(isHoleClosing, isHoleClosing, circle, orders, cpTrees, poss);
+    if (anyFailed) {
+        cpNodes.forEach(cpNode => {
+            if (cpNode !== undefined) {
+                removeCpNode(cpNode, cpTrees);
             }
-        }
-        return;
-    }
-    // Antipode
-    const newCpAntipodes = [];
-    const cpAntipodes = [];
-    const cpTreeAntipodes = [];
-    const deltaAntipodes = [];
-    const loopAntipodes = [];
-    for (let i = 0; i < posAntipodes.length; i++) {
-        const posAntipode = posAntipodes[i];
-        const orderAntipode = orderAntipodes[i];
-        const cpAntipode = {
-            pointOnShape: posAntipode, circle, order: orderAntipode, order2: 0
-        };
-        cpAntipodes.push(cpAntipode);
-        const loopAntipode = posAntipode.curve.loop;
-        loopAntipodes.push(loopAntipode);
-        const cpTreeAntipode = cpGraphs.get(loopAntipode);
-        cpTreeAntipodes.push(cpTreeAntipode);
-        const deltaAntipode = getNeighbouringPoints(cpTreeAntipode, posAntipode, orderAntipode, 0);
-        deltaAntipodes.push(deltaAntipode);
-        newCpAntipodes.push(insertCpNode(holeClosing, false, cpTreeAntipode, cpAntipode, deltaAntipode[0]));
+        });
+        return undefined;
     }
-    // Source
-    const cpSource = { pointOnShape: posSource, circle, order: orderSource, order2: 0 };
-    const loopSource = posSource.curve.loop;
-    const cpTreeSource = cpGraphs.get(loopSource);
-    const deltaSource = getNeighbouringPoints(cpTreeSource, posSource, orderSource, 0);
-    const newCpSource = insertCpNode(holeClosing, false, cpTreeSource, cpSource, deltaSource[0]);
-    // Connect graph
-    if (newCpAntipodes.length === 1) {
-        newCpSource.prevOnCircle = newCpAntipodes[0];
-        newCpSource.nextOnCircle = newCpAntipodes[0];
-        newCpAntipodes[0].prevOnCircle = newCpSource;
-        newCpAntipodes[0].nextOnCircle = newCpSource;
-    }
-    else {
-        const cpNodes = newCpAntipodes.slice();
-        cpNodes.push(newCpSource);
-        // Order points according to their angle with the x-axis
-        cpNodes.sort(byAngle(circle));
-        for (let i = 0; i < cpNodes.length; i++) {
-            const iNext = (i + 1 === cpNodes.length) ? 0 : i + 1;
-            const iPrev = (i === 0) ? cpNodes.length - 1 : i - 1;
-            const cpNodeCurr = cpNodes[i];
-            const cpNodeNext = cpNodes[iNext];
-            const cpNodePrev = cpNodes[iPrev];
-            cpNodeCurr.nextOnCircle = cpNodeNext;
-            cpNodeCurr.prevOnCircle = cpNodePrev;
-        }
+    // Get points ordered according to their angle with the x-axis
+    // joinSpokes(circle, cpNodes);
+    if (isHoleClosing) {
+        closeHole(cpTrees, cpNodes);
     }
-    if (holeClosing) {
-        // TODO - take care of case where there are more than 1 antipode
-        // Duplicate ContactPoints
-        const cpB2 = { pointOnShape: posAntipodes[0], circle, order: cpAntipodes[0].order, order2: +1 };
-        const newCpB2Node = insertCpNode(true, false, cpTreeAntipodes[0], cpB2, newCpAntipodes[0]);
-        const cpB1 = { pointOnShape: posSource, circle, order: cpSource.order, order2: -1 };
-        const newCpB1Node = insertCpNode(true, false, cpTreeSource, cpB1, newCpSource.prev);
-        // Connect graph
-        newCpB1Node.prevOnCircle = newCpB2Node;
-        newCpB1Node.nextOnCircle = newCpB2Node;
-        newCpB2Node.prevOnCircle = newCpB1Node;
-        newCpB2Node.nextOnCircle = newCpB1Node;
-        newCpAntipodes[0].next = newCpSource;
-        newCpSource.prev = newCpAntipodes[0];
-        newCpB1Node.next = newCpB2Node;
-        newCpB2Node.prev = newCpB1Node;
-    }
-    if (typeof _debug_ !== 'undefined') {
-        let elems;
-        if (holeClosing) {
-            elems = _debug_.generated.elems['twoProng_holeClosing'];
-        }
-        else {
-            elems = _debug_.generated.elems['twoProng_regular'];
-        }
-        const elem = elems[elems.length - 1];
-        if (!newCpSource) {
-            console.log('asas');
-        }
-        elem.cpNode = newCpSource;
-    }
-    return newCpSource;
+    return cpNodes[0]; // return the source `CpNode`
 }
-/** @internal */
-function byAngle(circle) {
-    const c = circle.center;
-    return function (_a, _b) {
-        let a = _a.cp.pointOnShape.p;
-        let b = _b.cp.pointOnShape.p;
-        // Move onto origin
-        a = [a[0] - c[0], a[1] - c[1]];
-        b = [b[0] - c[0], b[1] - c[1]];
-        const a_ = Math.atan2(a[1], a[0]);
-        const b_ = Math.atan2(b[1], b[0]);
-        return b_ - a_;
-    };
+function closeHole(cpTrees, cpNodes) {
+    const [cpNodeA, cpNodeB] = cpNodes;
+    // Duplicate ContactPoints
+    // const antipodeCpNode = cpNodeB[0];
+    const cpAntipode = cpNodeB.cp;
+    const cpNodeB2 = insertCpNode(true, true, false, cpTrees.get(cpAntipode.pointOnShape.curve.loop), { ...cpAntipode, order2: +1 }, cpNodeB);
+    const cpNodeB1 = insertCpNode(true, true, false, cpTrees.get(cpNodeA.cp.pointOnShape.curve.loop), { ...cpNodeA.cp, order2: -1 }, cpNodeA.prev);
+    // Connect graph
+    cpNodeB1.prevOnCircle = cpNodeB2;
+    cpNodeB1.nextOnCircle = cpNodeB2;
+    cpNodeB2.prevOnCircle = cpNodeB1;
+    cpNodeB2.nextOnCircle = cpNodeB1;
+    cpNodeB.next = cpNodeA;
+    cpNodeA.prev = cpNodeB;
+    cpNodeB1.next = cpNodeB2;
+    cpNodeB2.prev = cpNodeB1;
 }
 export { add2Prong };
 //# sourceMappingURL=add-2-prong.js.map

package/node/find-2-prong/add-2-prong.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-2-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/add-2-prong.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"add-2-prong.js","sourceRoot":"","sources":["../../src/find-2-prong/add-2-prong.ts"],"names":[],"mappings":"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"}

package/node/find-2-prong/calc-seperation-tolerance.d.ts

@@ -0,0 +1,2 @@
+export { calcSeperationTolerance };
+declare function calcSeperationTolerance(R: number, r: number, δ: number): number;