flo-mat 3.0.15 → 4.0.1

package/node/cp-node/fs/is-one-prong.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-one-prong.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-one-prong.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,6DAA6D;AAC7D,SAAS,UAAU,CAAC,MAAc;IAC9B,MAAM,GAAG,GAAG,MAAM,CAAC;IAEnB,IAAI,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,GAAG,GAAG,GAAG,CAAC,YAAY,CAAC;IAE7B,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IACjC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEjC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"is-one-prong.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-one-prong.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D;;;;;;;GAOG;AACH,SAAS,UAAU,CAAC,MAAc;IAC9B,OAAO,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;AACpE,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}

package/node/cp-node/fs/is-order-correct.d.ts

@@ -1,5 +1,5 @@
 import type { CpNode } from "../cp-node.js";
 import { LlRbTree } from "flo-ll-rb-tree";
-import { ContactPoint } from "../../contact-point/contact-point.js";
-declare function isOrderCorrect(cpTree: LlRbTree<CpNode>, cp: ContactPoint, next: CpNode): boolean;
+import { PointOnShape } from "../../point-on-shape/point-on-shape.js";
+declare function isOrderCorrect(cpTree: LlRbTree<CpNode>, pos: PointOnShape, next: CpNode): boolean;
 export { isOrderCorrect };

package/node/cp-node/fs/is-order-correct.js

@@ -1,14 +1,11 @@
-import { compareCps } from "../../contact-point/contact-point.js";
-function isOrderCorrect(cpTree, cp, next) {
-    // TODO2
-    const c = compareCps(cp, next.cp);
+import { comparePoss } from "../../point-on-shape/compare-poss.js";
+function isOrderCorrect(cpTree, pos, next) {
+    const c = comparePoss(pos, next.pointOnShape);
     if (c < 0) {
         return true;
     }
     if (c === 0) {
-        // TODO2
-        // console.log('c === 0');
-        return true;
+        return false;
     }
     const minNode = cpTree.getMinNode();
     if (minNode === undefined) { // if tree not empty
@@ -17,7 +14,7 @@ function isOrderCorrect(cpTree, cp, next) {
     const min = minNode.datum;
     const max = cpTree.getMaxNode().datum;
     // larger than all -> crossing zero on loop
-    return (compareCps(max.cp, cp) < 0 && min === next);
+    return (comparePoss(max.pointOnShape, pos) < 0 && min === next);
 }
 export { isOrderCorrect };
 //# sourceMappingURL=is-order-correct.js.map

package/node/cp-node/fs/is-order-correct.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-order-correct.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-order-correct.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAgB,MAAM,sCAAsC,CAAC;AAGhF,SAAS,cAAc,CACf,MAAwB,EACxB,EAAgB,EAChB,IAAY;IAEhB,QAAQ;IACR,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC3B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACV,QAAQ;QACR,0BAA0B;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IACpC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC,CAAE,oBAAoB;QAC9C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC;IAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,EAAG,CAAC,KAAK,CAAC;IAEvC,2CAA2C;IAC3C,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC;AACvD,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"version":3,"file":"is-order-correct.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-order-correct.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGnE,SAAS,cAAc,CACf,MAAwB,EACxB,GAAiB,EACjB,IAAY;IAEhB,MAAM,CAAC,GAAG,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;IAC3B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACV,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;IACpC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC,CAAE,oBAAoB;QAC9C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC;IAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,EAAG,CAAC,KAAK,CAAC;IAEvC,2CAA2C;IAC3C,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,YAAa,EAAE,GAAG,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC;AACrE,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA"}

package/node/cp-node/fs/is-sharp.js

@@ -6,7 +6,7 @@
  * terminating and one not. See `isTerminating` for more details.
  */
 function isSharp(cpNode) {
-    return cpNode.cp.circle.radius === 0;
+    return cpNode.pointOnShape.circle.radius === 0;
 }
 export { isSharp };
 //# sourceMappingURL=is-sharp.js.map

package/node/cp-node/fs/is-sharp.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-sharp.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-sharp.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,SAAS,OAAO,CAAC,MAAc;IAC3B,OAAO,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;AACzC,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAA"}
+{"version":3,"file":"is-sharp.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-sharp.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,SAAS,OAAO,CAAC,MAAc;IAC3B,OAAO,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC;AACnD,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAA"}

package/node/cp-node/fs/remove-cp-node.js

@@ -1,11 +1,10 @@
 function removeCpNode(cpNode, meta) {
-    // cpTrees: Map<Loop, LlRbTree<CpNode>>): void {
     const { cpTrees } = meta;
     const prev = cpNode.prev;
     const next = cpNode.next;
     prev.next = next;
     next.prev = prev;
-    const cpTree = cpTrees.get(cpNode.cp.pointOnShape.curve.loop);
+    const cpTree = cpTrees.get(cpNode.pointOnShape.curve.loop);
     cpTree.remove(cpNode, false);
 }
 export { removeCpNode };

package/node/cp-node/fs/remove-cp-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-cp-node.js","sourceRoot":"","sources":["../../../src/cp-node/fs/remove-cp-node.ts"],"names":[],"mappings":"AAMA,SAAS,YAAY,CACb,MAAc,EACd,IAAa;IACb,gDAAgD;IAEpD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACjB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAEjB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;IAC/D,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACjC,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"remove-cp-node.js","sourceRoot":"","sources":["../../../src/cp-node/fs/remove-cp-node.ts"],"names":[],"mappings":"AAKA,SAAS,YAAY,CACb,MAAc,EACd,IAAa;IAEjB,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAEzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;IACxB,IAAwB,CAAC,IAAI,GAAG,IAAI,CAAC;IACrC,IAAwB,CAAC,IAAI,GAAG,IAAI,CAAC;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;IAC5D,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACjC,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/node/debug/debug-elem-types.d.ts

@@ -2,7 +2,7 @@ import { Mat } from '../mat/mat.js';
 import { CpNode } from '../cp-node/cp-node.js';
 type DebugElemKey = keyof typeof emptyDebugElems;
 declare const emptyDebugElems: {
-    readonly oneProng: CpNode[][];
+    readonly oneProng: CpNode[];
     readonly twoProng: CpNode[];
     readonly threeProng: CpNode[];
     readonly looseBoundingBox: number[][][];
@@ -16,7 +16,6 @@ declare const emptyDebugElems: {
     readonly cpNode: CpNode[];
     readonly branch: CpNode[][];
     readonly holeCloser: CpNode[];
-    readonly speed: CpNode[];
 };
 declare const debugElemNames: Array<keyof typeof emptyDebugElems>;
 /** @internal */

package/node/debug/debug-elem-types.js

@@ -15,8 +15,7 @@ const emptyDebugElems = {
     cull: [],
     cpNode: [],
     branch: [],
-    holeCloser: [],
-    speed: []
+    holeCloser: []
 };
 const debugElemNames = Object.keys(emptyDebugElems);
 export { emptyDebugElems, debugElemNames, };

package/node/debug/debug-elem-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug-elem-types.js","sourceRoot":"","sources":["../../src/debug/debug-elem-types.ts"],"names":[],"mappings":"AAOA,MAAM,eAAe,GAAG;IACpB,QAAQ,EAAE,EAAgB;IAC1B,8CAA8C;IAC9C,QAAQ,EAAE,EAAc;IACxB,UAAU,EAAE,EAAc;IAC1B,gBAAgB,EAAE,EAAkB;IACpC,gBAAgB,EAAE,EAAkB;IACpC,YAAY,EAAE,EAAkB;IAChC,8BAA8B;IAC9B,6BAA6B;IAC7B,MAAM,EAAE,EAAc;IACtB,GAAG,EAAE,EAAW;IAChB,SAAS,EAAE,EAAc;IACzB,MAAM,EAAE,EAAgB;IACxB,IAAI,EAAE,EAAgB;IACtB,MAAM,EAAE,EAAc;IACtB,MAAM,EAAE,EAAgB;IACxB,UAAU,EAAE,EAAc;IAC1B,KAAK,EAAE,EAAc;CACf,CAAC;AAGX,MAAM,cAAc,GAChB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAwC,CAAC;AASxE,OAAO,EAEH,eAAe,EAAE,cAAc,GAClC,CAAA"}
+{"version":3,"file":"debug-elem-types.js","sourceRoot":"","sources":["../../src/debug/debug-elem-types.ts"],"names":[],"mappings":"AAOA,MAAM,eAAe,GAAG;IACpB,QAAQ,EAAE,EAAc;IACxB,8CAA8C;IAC9C,QAAQ,EAAE,EAAc;IACxB,UAAU,EAAE,EAAc;IAC1B,gBAAgB,EAAE,EAAkB;IACpC,gBAAgB,EAAE,EAAkB;IACpC,YAAY,EAAE,EAAkB;IAChC,8BAA8B;IAC9B,6BAA6B;IAC7B,MAAM,EAAE,EAAc;IACtB,GAAG,EAAE,EAAW;IAChB,SAAS,EAAE,EAAc;IACzB,MAAM,EAAE,EAAgB;IACxB,IAAI,EAAE,EAAgB;IACtB,MAAM,EAAE,EAAc;IACtB,MAAM,EAAE,EAAgB;IACxB,UAAU,EAAE,EAAc;CACpB,CAAC;AAGX,MAAM,cAAc,GAChB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAwC,CAAC;AASxE,OAAO,EAEH,eAAe,EAAE,cAAc,GAClC,CAAA"}

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

@@ -3,10 +3,10 @@ import { scaleCircle } from '../../../geometry/circle.js';
 import { CpNodeFs } from '../../../cp-node/cp-node-fs.js';
 /** @internal */
 function drawCpNode(g, cpNode, classes = 'blue thin2 nofill', delay = 0, scaleFactor = 1) {
-    const circle = scaleCircle(cpNode.cp.circle, 1);
+    const circle = scaleCircle(cpNode.pointOnShape.circle, 1);
     const { center: c, radius: r } = circle;
     const poss = CpNodeFs.getAllOnCircle(cpNode)
-        .map(cpNode => cpNode.cp.pointOnShape);
+        .map(cpNode => cpNode.pointOnShape);
     const { dot, circle: drawCircle, crossHair } = drawFs;
     const $circle = drawCircle(g, circle, classes, delay);
     const $cps = [];

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

@@ -1 +1 @@
-{"version":3,"file":"draw-cp-node.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-cp-node.ts"],"names":[],"mappings":"AACA,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,UAAU,CACX,CAAc,EACd,MAAc,EACd,OAAO,GAAG,mBAAmB,EAC7B,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAG,WAAW,CACtB,MAAM,CAAC,EAAE,CAAC,MAAM,EAChB,CAAC,CACJ,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;IAExC,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;SACvC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAA;IAE1C,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAEtD,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAEtD,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;QAC/B,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;IAC5D,CAAC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,sBAAsB,EAAE,CAAC,GAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE7E,iBAAiB;IACjB,+FAA+F;IAC/F,IAAI;IAEJ,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,MAAM,CAAiB,CAAC;AACpE,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"draw-cp-node.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-cp-node.ts"],"names":[],"mappings":"AACA,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,UAAU,CACX,CAAc,EACd,MAAc,EACd,OAAO,GAAG,mBAAmB,EAC7B,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAG,WAAW,CACtB,MAAM,CAAC,YAAY,CAAC,MAAM,EAC1B,CAAC,CACJ,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;IAExC,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;SACvC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IAEvC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAEtD,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAEtD,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;QAC/B,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;IAC5D,CAAC;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,sBAAsB,EAAE,CAAC,GAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE7E,iBAAiB;IACjB,+FAA+F;IAC/F,IAAI;IAEJ,OAAO,CAAC,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,MAAM,CAAiB,CAAC;AACpE,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}

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

@@ -11,12 +11,9 @@ import { drawLeaves } from './draw-leaves.js';
 import { drawCull } from './draw-cull.js';
 import { drawBranch } from './draw-branch.js';
 import { drawCpNode } from './draw-cp-node.js';
-import { drawSpeed } from './draw-speed.js';
 /** @internal */
 const drawElemFs = {
     oneProng: drawOneProng,
-    // oneProngAtDullCorner,
-    // csf,
     twoProng: drawTwoProng(false, true),
     threeProng: drawThreeProng,
     boundingHull,
@@ -32,8 +29,7 @@ const drawElemFs = {
     cull: drawCull,
     cpNode: drawCpNode,
     branch: drawBranch,
-    holeCloser: drawTwoProng(false, false),
-    speed: drawSpeed
+    holeCloser: drawTwoProng(false, false)
 };
 const drawElemFsDetailed = {
     ...drawElemFs,

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

@@ -1 +1 @@
-{"version":3,"file":"draw-elem.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-elem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAgB5C,gBAAgB;AAChB,MAAM,UAAU,GAAsB;IAClC,QAAQ,EAAE,YAAY;IACtB,wBAAwB;IACxB,OAAO;IACP,QAAQ,EAAE,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC;IACnC,UAAU,EAAE,cAAc;IAC1B,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,eAAe;IACf,cAAc;IACd,MAAM;IACN,GAAG,EAAE,OAAO;IACZ,uBAAuB;IACvB,SAAS;IACT,MAAM,EAAE,UAAU;IAClB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC;IACtC,KAAK,EAAE,SAAS;CACnB,CAAA;AAGD,MAAM,kBAAkB,GAAsB;IAC1C,GAAG,UAAU;IACb,QAAQ,EAAE,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC;CACrC,CAAA;AAGD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAqB,CAAA"}
+{"version":3,"file":"draw-elem.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-elem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAgB/C,gBAAgB;AAChB,MAAM,UAAU,GAAsB;IAClC,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC;IACnC,UAAU,EAAE,cAAc;IAC1B,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,eAAe;IACf,cAAc;IACd,MAAM;IACN,GAAG,EAAE,OAAO;IACZ,uBAAuB;IACvB,SAAS;IACT,MAAM,EAAE,UAAU;IAClB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,UAAU,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC;CACzC,CAAA;AAGD,MAAM,kBAAkB,GAAsB;IAC1C,GAAG,UAAU;IACb,QAAQ,EAAE,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC;CACrC,CAAA;AAGD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAqB,CAAA"}

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

@@ -6,12 +6,12 @@ function drawLeaves(g, leaves, classes = 'thin10 deeppink nofill', delay = 0, sc
     const $elems = [];
     const { line, dot, circle: drawCircle } = drawFs;
     for (const cpNode of leaves) {
-        const cp = cpNode.cp;
+        const cp = cpNode.pointOnShape;
         const { circle } = cp;
         const { center: c, radius: r } = circle;
         const $center = [drawCirclePercent(g, c, 0.5, 'pinker thin5 nofill')];
         const poss = CpNodeFs.getAllOnCircle(cpNode)
-            .map(cpNode => cpNode.cp.pointOnShape);
+            .map(cpNode => cpNode.pointOnShape);
         const $ls = [];
         const $cps = [];
         for (let i = 0; i < poss.length; i++) {

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

@@ -1 +1 @@
-{"version":3,"file":"draw-leaves.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-leaves.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,gBAAgB;AAChB,SAAS,UAAU,CACX,CAAc,EACd,MAAgB,EAChB,OAAO,GAAG,wBAAwB,EAClC,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAEjD,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QACtB,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;QAExC,MAAM,OAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAEtE,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;aACvC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QAE3C,MAAM,GAAG,GAAiB,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAiB,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,GAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;YACjE,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACtD,6DAA6D;QAE7D,MAAM,CAAC,IAAI,CAAC,GAAG;YACX,GAAG,OAAO;YACV,GAAG,IAAI;YACP,GAAG,GAAG;YACN,GAAG,OAAO;SACb,CAAC,CAAC;IACP,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"draw-leaves.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-leaves.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,gBAAgB;AAChB,SAAS,UAAU,CACX,CAAc,EACd,MAAgB,EAChB,OAAO,GAAG,wBAAwB,EAClC,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAEjD,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC;QAC/B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;QACtB,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;QAExC,MAAM,OAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAAC;QAEtE,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;aACvC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAExC,MAAM,GAAG,GAAiB,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAiB,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAC,CAAC,EAAE,CAAC,GAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/B,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,GAAC,CAAC,CAAC,GAAC,CAAC,CAAC,GAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;YACjE,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACtD,6DAA6D;QAE7D,MAAM,CAAC,IAAI,CAAC,GAAG;YACX,GAAG,OAAO;YACV,GAAG,IAAI;YACP,GAAG,GAAG;YACN,GAAG,OAAO;SACb,CAAC,CAAC;IACP,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,UAAU,EAAE,CAAA"}

package/node/debug/functions/draw-elem/draw-max-vertex.d.ts

@@ -1,4 +1,4 @@
-import { CpNode } from '../../../cp-node/cp-node.js';
+import type { CpNode } from '../../../cp-node/cp-node.js';
 /** @internal */
 declare function maxVertex(g: SVGGElement, cpNode: CpNode): SVGCircleElement[];
 export { maxVertex };

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

@@ -1,7 +1,7 @@
 import { drawFs } from 'flo-draw';
 /** @internal */
 function maxVertex(g, cpNode) {
-    const circle = cpNode.cp.circle;
+    const circle = cpNode.pointOnShape.circle;
     const $elems = drawFs.circle(g, circle, 'brown thin10 nofill');
     return $elems;
 }

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

@@ -1 +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;IAE/D,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"draw-max-vertex.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-max-vertex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,gBAAgB;AAChB,SAAS,SAAS,CAAC,CAAc,EAAE,MAAc;IAC7C,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;IAE1C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAE/D,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

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

@@ -1,9 +1,18 @@
 import { drawFs } from 'flo-draw';
-import { getOsculatingCircle } from '../../../point-on-shape/get-osculating-circle.js';
+import { ddCurvature, ddNormal } from 'flo-bezier3';
 /** @hidden */
 function oneProngAtDullCorner(g, pos, classes, delay = 1000, scaleFactor = 1) {
-    //let oCircle = PointOnShape.getOsculatingCircle(Number.POSITIVE_INFINITY, pos);
-    const oCircle = getOsculatingCircle(Number.POSITIVE_INFINITY, pos);
+    //let oCircle = PointOnShape.getOsculatingCircle(Infinity, pos);
+    const { curve, p, t } = pos;
+    const { ps } = curve;
+    const norm = ddNormal(ps, t).map(c => c[1]);
+    // const [center,r] = getOsculatingCircle(Infinity, pos, norm);
+    const k = -(ddCurvature(ps, t)[1]);
+    const [tx, ty] = norm;
+    const l = Math.sqrt(tx * tx + ty * ty);
+    const scale = k * l;
+    const center = [p[0] - tx / scale, p[1] - ty / scale];
+    const oCircle = { center, radius: 1 / k };
     const $center = drawFs.dot(g, pos.p, 0.1, 'orange');
     const $circle = drawFs.dot(g, oCircle.center, 0.25, 'orange');
     const $pos = drawFs.circle(g, oCircle, 'orange thin10 nofill');

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

@@ -1 +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;IAElE,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;AAC7C,CAAC;AAGD,OAAO,EAAE,oBAAoB,EAAE,CAAA"}
+{"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;AAGlC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAa,MAAM,aAAa,CAAC;AAG/D,cAAc;AACd,SAAS,oBAAoB,CACrB,CAAc,EACd,GAAiB,EACjB,OAAgB,EAChB,KAAK,GAAG,IAAI,EACZ,WAAW,GAAG,CAAC;IAEnB,gEAAgE;IAChE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;IAC5B,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;IAErB,MAAM,IAAI,GAAG,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,+DAA+D;IAE/D,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAC,EAAE,GAAG,EAAE,GAAC,EAAE,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,CAAC,GAAC,CAAC,CAAC;IAClB,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,GAAC,KAAK,CAAC,CAAC;IAElD,MAAM,OAAO,GAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAC,CAAC,EAAE,CAAC;IAEhD,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;IAElE,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;AAC7C,CAAC;AAGD,OAAO,EAAE,oBAAoB,EAAE,CAAA"}

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

@@ -1,4 +1,4 @@
-import { CpNode } from '../../../cp-node/cp-node.js';
+import type { CpNode } from '../../../cp-node/cp-node.js';
 /** @hidden */
-declare function drawOneProng(g: SVGGElement, cpNodes: CpNode[], classes?: string, delay?: number, scaleFactor?: number): SVGCircleElement[];
+declare function drawOneProng(g: SVGGElement, cpNode: CpNode, classes?: string, delay?: number, scaleFactor?: number): SVGCircleElement[];
 export { drawOneProng };

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

@@ -1,12 +1,13 @@
 import { drawFs } from 'flo-draw';
 /** @hidden */
-function drawOneProng(g, cpNodes, classes, delay = 0, scaleFactor = 1) {
-    const cp = cpNodes[0].cp;
-    const { circle, pointOnShape: pos } = cp;
-    const $center = drawFs.dot(g, pos.p, 0.02 * scaleFactor, 'deeppink', delay);
-    const $circle = drawFs.dot(g, circle.center, 0.05 * scaleFactor, 'deeppink', delay);
-    const $pos = drawFs.circle(g, circle, 'deeppink thin5 nofill', delay);
-    return [...$center, ...$circle, ...$pos];
+function drawOneProng(g, cpNode, classes, delay = 0, scaleFactor = 1) {
+    // const cp = cpNode.cp;
+    const { pointOnShape: pos } = cpNode;
+    const { circle } = pos;
+    const $posP = drawFs.dot(g, pos.p, 0.02 * scaleFactor, 'deeppink', delay);
+    const $circleCenter = drawFs.dot(g, circle.center, 0.01 * scaleFactor, 'deeppink', delay);
+    const $circle = drawFs.circle(g, circle, 'deeppink thin5 nofill', delay);
+    return [...$posP, ...$circleCenter, ...$circle];
 }
 export { drawOneProng };
 //# sourceMappingURL=draw-one-prong.js.map

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

@@ -1 +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;IAEzE,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;AAC7C,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"draw-one-prong.js","sourceRoot":"","sources":["../../../../src/debug/functions/draw-elem/draw-one-prong.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,cAAc;AACd,SAAS,YAAY,CACb,CAAc,EACd,MAAc,EACd,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,wBAAwB;IACxB,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IACrC,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAEvB,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,GAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;IACxE,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,GAAC,WAAW,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;IACxF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,uBAAuB,EAAE,KAAK,CAAC,CAAC;IAEzE,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,aAAa,EAAE,GAAG,OAAO,CAAC,CAAC;AACpD,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

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

@@ -5,11 +5,11 @@ import { CpNodeFs } from '../../../cp-node/cp-node-fs.js';
 function drawThreeProng(g, 
 // threeProng: ThreeProngForDebugging,
 threeProng, classes, delay = 0, scaleFactor = 1) {
-    const circle = scaleCircle(threeProng.cp.circle, 1);
+    const circle = scaleCircle(threeProng.pointOnShape.circle, 1);
     const { center: c, radius: r } = circle;
     // const poss = threeProng.poss;
     const poss = CpNodeFs.getAllOnCircle(threeProng)
-        .map(cpNode => cpNode.cp.pointOnShape);
+        .map(cpNode => cpNode.pointOnShape);
     const { dot, circle: drawCircle, crossHair } = drawFs;
     const $circle = drawCircle(g, circle, 'blue thin2 nofill', delay);
     const $cps = [];

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

@@ -1 +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,CACf,CAAc;AACd,sCAAsC;AACtC,UAAkB,EAClB,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAG,WAAW,CACtB,UAAU,CAAC,EAAE,CAAC,MAAM,EACpB,CAAC,CACJ,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;SAC3C,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAA;IAE1C,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;QAC/B,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;IAC5D,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;AACpE,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA"}
+{"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,CACf,CAAc;AACd,sCAAsC;AACtC,UAAkB,EAClB,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAG,WAAW,CACtB,UAAU,CAAC,YAAY,CAAC,MAAM,EAC9B,CAAC,CACJ,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;SAC3C,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;IAEvC,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;QAC/B,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;IAC5D,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;AACpE,CAAC;AAGD,OAAO,EAAE,cAAc,EAAE,CAAA"}

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

@@ -16,11 +16,12 @@ function drawTwoProng(drawCrosshair, drawSpokes) {
                 break;
             }
         }
-        const cp = twoProng.cp;
-        const { circle, pointOnShape: pos } = cp;
+        // const cp = twoProng.cp;
+        const { pointOnShape: pos } = twoProng;
+        const { circle } = pos;
         const { center: c, radius: r } = circle;
         const { isSource, p } = pos;
-        const p2 = twoProng.nextOnCircle.cp.pointOnShape.p;
+        const p2 = twoProng.nextOnCircle.pointOnShape.p;
         const pS = isSource ? p : p2;
         const pA = isSource ? p2 : p;
         const { line, dot, circle: drawCircle, crossHair } = drawFs;

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

@@ -1 +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,CACb,aAAsB,EACtB,UAAmB;IAEvB,OAAO,CAAC,CAAc,EACd,QAAgB,EAChB,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC,EAAE,EAAE;QAEvB,IAAI,KAAK,CAAC;QACV,IAAI,IAAI,CAAC;QAET,QAAQ,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC7B,KAAK,KAAK,CAAC,CAAC,CAAC;gBACT,KAAK,GAAG,MAAM,CAAC;gBACf,IAAI,GAAG,GAAG,CAAC;gBACX,MAAM;YACV,CAAC;YACD,KAAK,IAAI,CAAC,CAAC,CAAC;gBACR,KAAK,GAAG,OAAO,CAAC;gBAChB,IAAI,GAAG,IAAI,CAAC;gBACZ,MAAM;YACV,CAAC;QACL,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;YACxB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,GAAC,WAAW,EAAE,KAAK,CAAC;YAC3E,CAAC,CAAC,EAAE,CAAC;QAET,OAAO;YACH,GAAG,OAAO;YACV,GAAG,IAAI;YACP,GAAG,IAAI;YACP,UAAU;YACV,UAAU;YACV,GAAG,MAAM;YACT,GAAG,OAAO;SACb,CAAC;IACN,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"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,CACb,aAAsB,EACtB,UAAmB;IAEvB,OAAO,CAAC,CAAc,EACd,QAAgB,EAChB,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC,EAAE,EAAE;QAEvB,IAAI,KAAK,CAAC;QACV,IAAI,IAAI,CAAC;QAET,QAAQ,QAAQ,CAAC,aAAa,EAAE,CAAC;YAC7B,KAAK,KAAK,CAAC,CAAC,CAAC;gBACT,KAAK,GAAG,MAAM,CAAC;gBACf,IAAI,GAAG,GAAG,CAAC;gBACX,MAAM;YACV,CAAC;YACD,KAAK,IAAI,CAAC,CAAC,CAAC;gBACR,KAAK,GAAG,OAAO,CAAC;gBAChB,IAAI,GAAG,IAAI,CAAC;gBACZ,MAAM;YACV,CAAC;QACL,CAAC;QAED,0BAA0B;QAC1B,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;QACvC,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;QACvB,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,YAAY,CAAC,CAAC,CAAC;QAChD,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;YACxB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,GAAC,WAAW,EAAE,KAAK,CAAC;YAC3E,CAAC,CAAC,EAAE,CAAC;QAET,OAAO;YACH,GAAG,OAAO;YACV,GAAG,IAAI;YACP,GAAG,IAAI;YACP,UAAU;YACV,UAAU;YACV,GAAG,MAAM;YACT,GAAG,OAAO;SACb,CAAC;IACN,CAAC,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

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

@@ -3,7 +3,7 @@ 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;
+    const circle = cpNode.pointOnShape.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);

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

@@ -1 +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,CACP,CAAc,EACd,MAAc,EACd,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,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;AACjB,CAAC;AAGD,OAAO,EAAE,MAAM,EAAE,CAAA"}
+{"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,CACP,CAAc,EACd,MAAc,EACd,OAAgB,EAChB,KAAK,GAAG,CAAC,EACT,WAAW,GAAG,CAAC;IAEnB,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;IAE1C,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;AACjB,CAAC;AAGD,OAAO,EAAE,MAAM,EAAE,CAAA"}

package/node/debug/functions/general.js

@@ -14,7 +14,7 @@ function nameObj(o, pre = '') {
  * @param cpNodes A boundary piece given by two CpNodes.
  */
 function δToString(cpNodes) {
-    return cpNodes.map(cpNode => posToHumanString(cpNode.cp.pointOnShape));
+    return cpNodes.map(cpNode => posToHumanString(cpNode.pointOnShape));
 }
 /**
  * @internal

package/node/debug/functions/general.js.map

@@ -1 +1 @@
-{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../src/debug/functions/general.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAa/E,gBAAgB;AAChB,IAAI,CAAC,GAAG,CAAC,CAAC;AACV;;;GAGG;AACH,SAAS,OAAO,CAAC,CAAM,EAAE,GAAG,GAAG,EAAE;IAC7B,CAAC,CAAC,IAAI,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;AAC5B,CAAC;AAGD;;;;GAIG;AACH,SAAS,SAAS,CAAC,OAAiB;IAChC,OAAO,OAAO,CAAC,GAAG,CACd,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CACrD,CAAC;AACN,CAAC;AAGD;;;;GAIG;AACH,SAAS,UAAU,CAAC,OAAmB;IACnC,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAClC,CAAC;AAGD;;;;GAIG;AACH,SAAS,WAAW,CAAC,EAAc,EAAE,aAAa,GAAG,CAAC;IAClD,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;AACrD,CAAC;AAGD;;;;;GAKG;AACH,SAAS,UAAU,CAAC,CAAW,EAAE,aAAa,GAAG,CAAC;IAC9C,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;AAC5E,CAAC;AAGD,gBAAgB;AAChB,MAAM,qBAAqB,CAAA,4BAA4B,GAAG;IACtD,SAAS;IACT,UAAU;IACV,UAAU;IACV,WAAW;IACX,OAAO;CACV,CAAA;AAGD,OAAO,EAAE,qBAAqB,EAAE,CAAA"}
+{"version":3,"file":"general.js","sourceRoot":"","sources":["../../../src/debug/functions/general.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAa/E,gBAAgB;AAChB,IAAI,CAAC,GAAG,CAAC,CAAC;AACV;;;GAGG;AACH,SAAS,OAAO,CAAC,CAAM,EAAE,GAAG,GAAG,EAAE;IAC7B,CAAC,CAAC,IAAI,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;AAC5B,CAAC;AAGD;;;;GAIG;AACH,SAAS,SAAS,CAAC,OAAiB;IAChC,OAAO,OAAO,CAAC,GAAG,CACd,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,CAClD,CAAC;AACN,CAAC;AAGD;;;;GAIG;AACH,SAAS,UAAU,CAAC,OAAmB;IACnC,OAAO,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAClC,CAAC;AAGD;;;;GAIG;AACH,SAAS,WAAW,CAAC,EAAc,EAAE,aAAa,GAAG,CAAC;IAClD,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;AACrD,CAAC;AAGD;;;;;GAKG;AACH,SAAS,UAAU,CAAC,CAAW,EAAE,aAAa,GAAG,CAAC;IAC9C,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;AAC5E,CAAC;AAGD,gBAAgB;AAChB,MAAM,qBAAqB,CAAA,4BAA4B,GAAG;IACtD,SAAS;IACT,UAAU;IACV,UAAU;IACV,WAAW;IACX,OAAO;CACV,CAAA;AAGD,OAAO,EAAE,qBAAqB,EAAE,CAAA"}

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

@@ -1,10 +1,10 @@
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { MatMeta } from '../mat/mat-meta.js';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { MatMeta } from '../mat/mat-meta.js';
 /**
  * @hidden
  * Add a 1-prong to the MAT.
  * @param cpTrees
  * @param pos
  */
-declare function add1Prong(meta: MatMeta, radius: number, center: number[], pos: PointOnShape): void;
+declare function add1Prong(meta: MatMeta, radius: number, center: number[], pos: PrePointOnShape): void;
 export { add1Prong };

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

@@ -2,7 +2,7 @@ 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';
+import { getPosCorner$ } from '../point-on-shape/get-pos-corner.js';
 /**
  * @hidden
  * Add a 1-prong to the MAT.
@@ -10,9 +10,9 @@ import { getPosCorner } from '../point-on-shape/get-pos-corner.js';
  * @param pos
  */
 function add1Prong(meta, radius, center, pos) {
-    if (isPosCorner(pos) && getPosCorner(pos).isDull) {
+    if (isPosCorner(pos) && getPosCorner$(pos).isDull) {
         // This is a 1-prong at a dull corner.
-        // TODO IMPORTANT 
+        // FUTURE
         // Remove this line, uncomment piece below it and implement the 
         // following strategy to find the 3-prongs: if deltas are conjoined due 
         // to dull corner, split the conjoinment by inserting successively 
@@ -27,7 +27,7 @@ function add1Prong(meta, radius, center, pos) {
         return;
     }
     const circle = { radius, center };
-    const order = calcPosOrder(circle, pos);
+    const order = calcPosOrder(circle.center, pos);
     // Make sure there isn't already a ContactPoint close by - it can cause
     // floating point stability issues.
     if (getCloseByCpIfExist(meta, pos, circle, order, 0, 1)) {

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":"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,CACV,IAAa,EACb,MAAc,EACd,MAAgB,EAChB,GAAiB;IAErB,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;QAC/C,sCAAsC;QAEtC,kBAAkB;QAClB,gEAAgE;QAChE,wEAAwE;QACxE,mEAAmE;QACnE,mEAAmE;QACnE,qEAAqE;QACrE,kEAAkE;QAClE,oEAAoE;QAEpE,kCAAkC;QAElC,yCAAyC;QACrC,0DAA0D;QAC9D,IAAI;QAEJ,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAE1C,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;QACtD,OAAO;IACX,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAEjG,yCAAyC;IACzC,sDAAsD;IACtD,IAAI;AACR,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":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAGpE;;;;;GAKG;AACH,SAAS,SAAS,CACV,IAAa,EACb,MAAc,EACd,MAAgB,EAChB,GAAoB;IAExB,IAAI,WAAW,CAAC,GAAG,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC;QAChD,sCAAsC;QAEtC,SAAS;QACT,gEAAgE;QAChE,wEAAwE;QACxE,mEAAmE;QACnE,mEAAmE;QACnE,qEAAqE;QACrE,kEAAkE;QAClE,oEAAoE;QAEpE,kCAAkC;QAElC,yCAAyC;QACrC,0DAA0D;QAC9D,IAAI;QAEJ,OAAO;IACX,CAAC;IAED,MAAM,MAAM,GAAW,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAE1C,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/C,uEAAuE;IACvE,mCAAmC;IACnC,IAAI,mBAAmB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO;IACX,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IAEjG,yCAAyC;IACzC,sDAAsD;IACtD,IAAI;AACR,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

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

@@ -1,18 +1,17 @@
-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';
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { Circle } from '../geometry/circle.js';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { MatMeta } from '../mat/mat-meta.js';
 /**
- * @internal
  * Adds a 2-prong contact circle to the shape.
  *
- * @param cpTrees
+ * @param meta
  * @param circle Circle containing the 2 contact points
- * @param posSource The source point on shape
- * @param posAntipode The found antipodal point on shape
+ * @param pposSource The source point on shape
+ * @param pposAntipode The found antipodal point on shape
  * @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.
+ *
+ * @internal
  */
-declare function add2Prong(meta: MatMeta, circle: Circle, poss: PointOnShape[], isHoleClosing: boolean): CpNode | undefined;
+declare function add2Prong(meta: MatMeta, circle: Circle, pposSource: PrePointOnShape, pposAntipode: PrePointOnShape, isHoleClosing: boolean): CpNode | undefined;
 export { add2Prong };

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

@@ -1,34 +1,40 @@
 import { calcPosOrder } from '../point-on-shape/calc-pos-order.js';
-import { createPos } from '../point-on-shape/create-pos.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 cpTrees
+ * @param meta
  * @param circle Circle containing the 2 contact points
- * @param posSource The source point on shape
- * @param posAntipode The found antipodal point on shape
+ * @param pposSource The source point on shape
+ * @param pposAntipode The found antipodal point on shape
  * @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.
+ *
+ * @internal
  */
-function add2Prong(meta, circle, poss, isHoleClosing) {
-    poss[0] = poss[0].t === 0
-        ? createPos(poss[0].curve.prev, 1, true)
-        : poss[0];
-    const orders = poss.map(pos => calcPosOrder(circle, pos));
+function add2Prong(meta, circle, pposSource, pposAntipode, isHoleClosing) {
+    pposSource = pposSource.t === 0
+        ? { ...pposSource, curve: pposSource.curve.prev, t: 1 }
+        : pposSource;
+    const orderSource = calcPosOrder(circle.center, pposSource);
+    const orderAntipode = calcPosOrder(circle.center, pposAntipode);
+    const posAntipode = {
+        ...pposAntipode, circle, order: orderAntipode, order2: 0
+    };
+    const posSource = {
+        ...pposSource, circle, order: orderSource, order2: 0
+    };
     // Make sure there isn't already a ContactPoint close by - it can cause
     // floating point stability issues.
-    for (let i = 0; i < poss.length; i++) {
-        if (!!getCloseByCpIfExist(meta, poss[i], circle, orders[i], 0, 2)) {
-            return undefined;
-        }
+    if (!!getCloseByCpIfExist(meta, pposSource, circle, orderSource, 0, 2)) {
+        return undefined;
+    }
+    if (!!getCloseByCpIfExist(meta, pposAntipode, circle, orderAntipode, 0, 2)) {
+        return undefined;
     }
-    const { anyFailed, cpNodes } = addToCpTree(isHoleClosing, isHoleClosing, circle, orders, meta, poss);
+    const { anyFailed, cpNodes } = addToCpTree(isHoleClosing, isHoleClosing, circle, [orderSource, orderAntipode], meta, [posSource, posAntipode]);
     if (anyFailed) {
         cpNodes.forEach(cpNode => {
             if (cpNode !== undefined) {
@@ -37,8 +43,6 @@ function add2Prong(meta, circle, poss, isHoleClosing) {
         });
         return undefined;
     }
-    // Get points ordered according to their angle with the x-axis
-    // joinSpokes(circle, cpNodes);
     if (isHoleClosing) {
         closeHole(meta, cpNodes);
     }
@@ -46,25 +50,26 @@ function add2Prong(meta, circle, poss, isHoleClosing) {
 }
 function closeHole(meta, cpNodes) {
     const { cpTrees } = meta;
-    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, meta.lastInsertId);
-    cpNodeB2.holeCloserTwin = cpNodeB;
-    cpNodeB.holeCloserTwin = cpNodeB2;
-    const cpNodeB1 = insertCpNode(true, true, false, cpTrees.get(cpNodeA.cp.pointOnShape.curve.loop), { ...cpNodeA.cp, order2: -1 }, cpNodeA.prev, meta.lastInsertId);
-    cpNodeB1.holeCloserTwin = cpNodeA;
-    cpNodeA.holeCloserTwin = cpNodeB1;
+    const [cpNodeSource, cpNodeAntipode] = cpNodes;
+    // Antipode - create and insert twin
+    const posAntipode = cpNodeAntipode.pointOnShape;
+    const cpNodeAntipodeTwin = insertCpNode(true, true, false, cpTrees.get(posAntipode.curve.loop), { ...posAntipode, order2: +1 }, cpNodeAntipode, meta.lastInsertId);
+    cpNodeAntipodeTwin.holeCloserTwin = cpNodeAntipode;
+    cpNodeAntipode.holeCloserTwin = cpNodeAntipodeTwin;
+    // Source - create and insert twin
+    const posSource = cpNodeSource.pointOnShape;
+    const cpNodeSourceTwin = insertCpNode(true, true, false, cpTrees.get(posSource.curve.loop), { ...cpNodeSource.pointOnShape, order2: -1 }, cpNodeSource.prev, meta.lastInsertId);
+    cpNodeSourceTwin.holeCloserTwin = cpNodeSource;
+    cpNodeSource.holeCloserTwin = cpNodeSourceTwin;
     // 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;
+    cpNodeSourceTwin.prevOnCircle = cpNodeAntipodeTwin;
+    cpNodeSourceTwin.nextOnCircle = cpNodeAntipodeTwin;
+    cpNodeAntipodeTwin.prevOnCircle = cpNodeSourceTwin;
+    cpNodeAntipodeTwin.nextOnCircle = cpNodeSourceTwin;
+    cpNodeAntipode.next = cpNodeSource;
+    cpNodeSource.prev = cpNodeAntipode;
+    cpNodeSourceTwin.next = cpNodeAntipodeTwin;
+    cpNodeAntipodeTwin.prev = cpNodeSourceTwin;
 }
 export { add2Prong };
 //# sourceMappingURL=add-2-prong.js.map