flo-mat 1.2.0 → 2.0.0

package/src/mat/find-mat/find-and-add-hole-closing-2-prongs.ts

@@ -1,11 +1,10 @@
-
-import LlRbTree from 'flo-ll-rb-tree';
-import { Loop } from "../../loop";
-import { CpNode } from '../../cp-node';
-import { getShapeBounds } from '../../svg/get-shape-bounds';
-import { getMinYPos } from '../../svg/get-min-y-pos'
-import { find2Prong } from './find-2-prong/find-2-prong';
-import { add2Prong } from './add-2-prong';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { Loop } from '../../loop.js';
+import { CpNode } from '../../cp-node.js';
+import { getShapeBounds } from '../../svg/get-shape-bounds.js';
+import { getMinYPos } from '../../svg/get-min-y-pos.js';
+import { find2Prong } from './find-2-prong/find-2-prong.js';
+import { add2Prong } from './add-2-prong.js';
 
 
 /**

package/src/mat/find-mat/get-potential-2-prongs.ts

@@ -1,5 +1,4 @@
-
-import { IPointOnShape, isPosQuiteSharpCorner } from '../../point-on-shape';
+import { IPointOnShape, isPosQuiteSharpCorner } from '../../point-on-shape.js';
 
 
 /** @hidden */

package/src/mat/find-mat/get-sharp-corners.ts

@@ -1,5 +1,4 @@
-
-import { IPointOnShape, isPosQuiteSharpCorner } from '../../point-on-shape';
+import { IPointOnShape, isPosQuiteSharpCorner } from '../../point-on-shape.js';
 
 
 /** @hidden */

package/src/mat/find-mat/get-total-abs-curvature.ts

@@ -1,7 +1,6 @@
-
 import { totalAbsoluteCurvature } from 'flo-bezier3';
-import { getCurvatureAtInterface } from '../../svg/get-curvature-at-interface';
-import { getTotalBy } from './get-total-by';
+import { getCurvatureAtInterface } from '../../svg/get-curvature-at-interface.js';
+import { getTotalBy } from './get-total-by.js';
 
 
 /**

package/src/mat/find-mat/get-total-by.ts

@@ -1,6 +1,5 @@
-
-import { Curve } from '../../curve';
-import { Loop } from '../../loop';
+import { Curve } from '../../curve.js';
+import { Loop } from '../../loop.js';
 
 
 /**

package/src/mat/geometry/get-closest-square-distance-to-rect.ts

@@ -1,14 +1,25 @@
+import { squaredDistanceBetween as squaredDistanceBetween_ } from 'flo-vector2d';
 
-import { squaredDistanceBetween } from 'flo-vector2d';
+const squaredDistanceBetween = squaredDistanceBetween_;
 
 
 /**
  * @hidden
  */
-function getClosestSquareDistanceToRect(box: number[][], p: number[]) {
+function getClosestSquareDistanceToRect(
+		box: number[][], p: number[]): number {
 
-	let [[x0,y0],[x1,y1]] = box;
-	let [xp,yp] = p;
+	const p0 = box[0];
+	const p1 = box[1];
+	const x0 = p0[0];
+	const y0 = p0[1];
+	const x1 = p1[0];
+	const y1 = p1[1];	
+	const xp = p[0];
+	const yp = p[1];
+
+	//let [[x0,y0],[x1,y1]] = box;
+	//let [xp,yp] = p;
 	
 	if (xp < x0) {
 		if (yp < y0) {

package/src/mat/geometry/get-closest-squared-distance-to-rotated-rect.ts

@@ -1,4 +1,3 @@
-
 import { 
 	squaredDistanceBetweenPointAndLineSegment, squaredDistanceBetween 
 } from 'flo-vector2d';

package/src/mat/get-boundary-piece-beziers.ts

@@ -1,9 +1,8 @@
-
-import { CpNode } from '../cp-node';
-import { Curve } from '../curve';
-import { BezierPiece } from './bezier-piece';
-import { isPosQuiteSharpCorner } from '../point-on-shape';
-import { compareCps } from '../contact-point';
+import { CpNode } from '../cp-node.js';
+import { Curve } from '../curve.js';
+import { BezierPiece } from './bezier-piece.js';
+import { isPosQuiteSharpCorner } from '../point-on-shape.js';
+import { compareCps } from '../contact-point.js';
 
 
 /**

package/src/mat/get-contact-circles-at-interface.ts

@@ -1,7 +1,6 @@
-
-import { Curve, getCornerAtEnd        } from '../curve';
-import { PointOnShape } from '../point-on-shape';
-import { IPointOnShape } from '..';
+import { Curve, getCornerAtEnd } from '../curve.js';
+import { PointOnShape } from '../point-on-shape.js';
+import { IPointOnShape } from '../point-on-shape.js';
 
 
 /**

package/src/mat/get-edges-as-array.ts

@@ -1,6 +1,5 @@
-
-import { CpNode } from '../cp-node';
-import { traverseEdges } from '../traverse-edges';
+import { CpNode } from '../cp-node.js';
+import { traverseEdges } from '../traverse-edges.js';
 
 
 /** @hidden */

package/src/mat/get-largest-three-prong.ts

@@ -1,5 +1,4 @@
-
-import { CpNode } from '../cp-node';
+import { CpNode } from '../cp-node.js';
 
 
 /** @hidden */

package/src/mat/get-largest-vertex.ts

@@ -1,5 +1,4 @@
-
-import { CpNode } from '../cp-node';
+import { CpNode } from '../cp-node.js';
 
 
 /** @hidden */

package/src/mat/get-leaves.ts

@@ -1,5 +1,4 @@
-
-import { CpNode } from '../cp-node';
+import { CpNode } from '../cp-node.js';
 
 
 /** @hidden */

package/src/mat/get-neighboring-cps.ts

@@ -1,7 +1,6 @@
-
-import LlRbTree from 'flo-ll-rb-tree';
-import { IPointOnShape } from '../point-on-shape';
-import { CpNode } from '../cp-node';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { IPointOnShape } from '../point-on-shape.js';
+import { CpNode } from '../cp-node.js';
 
 
 /**
@@ -38,8 +37,8 @@ function getNeighbouringPoints(
     }
 
     return [
-        cps[0].data, 
-        cps[1].data
+        cps[0].datum, 
+        cps[1].datum
     ] as CpNode[];  
 }
 

package/src/mat/get-two-prong-type.ts

@@ -1,6 +1,5 @@
-
-import { TwoProngForDebugging } from "../debug/two-prong-for-debugging";
-import { ElemType_TwoProng } from "./elem-type-two-prong";
+import { TwoProngForDebugging } from '../debug/two-prong-for-debugging.js';
+import { ElemType_TwoProng } from './elem-type-two-prong.js';
 
 
 /** @hidden */

package/src/mat/is-another-cp-closeby.ts

@@ -1,11 +1,10 @@
-
-import LlRbTree from "flo-ll-rb-tree";
+import { LlRbTree } from 'flo-ll-rb-tree';
 import { distanceBetween, toUnitVector, fromTo, dot } from 'flo-vector2d';
-import { Loop } from "../loop";
-import { CpNode } from "../cp-node";
-import { IPointOnShape } from "../point-on-shape";
-import { Circle } from "../circle";
-import { getNeighbouringPoints } from "./get-neighboring-cps";
+import { Loop } from '../loop.js';
+import { CpNode } from '../cp-node.js';
+import { IPointOnShape } from '../point-on-shape.js';
+import { Circle } from '../circle.js';
+import { getNeighbouringPoints } from './get-neighboring-cps.js';
 
 
 /** @hidden */

package/src/mat/simplify-mat-map-only.ts

@@ -1,10 +1,8 @@
-
-import { CpNode } from "../cp-node";
-import { getBranches } from "../get-branches";
-import { hausdorffDistance, toCubic } from "flo-bezier3";
-import { getCurveToNext } from "../get-curve-to-next";
-import { getCurveBetween } from "../get-curve/get-curve-between";
-import { closestPointOnBezier } from "flo-bezier3/node/simultaneous-properties/closest-point-on-bezier/closest-point-on-bezier";
+import { closestPointOnBezier, hausdorffDistance, toCubic } from 'flo-bezier3';
+import { CpNode } from '../cp-node.js';
+import { getBranches } from '../get-branches.js';
+import { getCurveToNext } from '../get-curve-to-next.js';
+import { getCurveBetween } from '../get-curve/get-curve-between.js';
 
 
 /**

package/src/mat/to-scale-axis/add-debug-info.ts

@@ -1,8 +1,7 @@
-
 declare var _debug_: Debug; 
 
-import { Debug } from '../../debug/debug';
-import { Mat    } from '../../mat';
+import { Debug } from '../../debug/debug.js';
+import { Mat } from '../../mat.js';
 
 
 /**

package/src/mat/to-scale-axis/add-to-tree.ts

@@ -1,7 +1,6 @@
-
-import { Circle } from '../../circle';
-import { calcGroups } from './calc-groups';
-import { TTree } from './t-tree';
+import { Circle } from '../../circle.js';
+import { calcGroups } from './calc-groups.js';
+import { TTree } from './t-tree.js';
 
 
 // DEPTH_LIMIT can be anything from 1 to 16, but from 2 to 6 seem to be the 

package/src/mat/to-scale-axis/calc-groups.ts

@@ -1,5 +1,4 @@
-
-import { Circle } from '../../circle';
+import { Circle } from '../../circle.js';
 
 
 /**

package/src/mat/to-scale-axis/create-spacial-tree.ts

@@ -1,7 +1,6 @@
-
-import { Circle } from '../../circle';
-import { TTree } from './t-tree';
-import { addToTree } from './add-to-tree';
+import { Circle } from '../../circle.js';
+import { TTree } from './t-tree.js';
+import { addToTree } from './add-to-tree.js';
 
 
 /** @hidden */

package/src/mat/to-scale-axis/cull-non-cycles.ts

@@ -1,6 +1,5 @@
-
-import { getLeaves } from '../get-leaves';
-import { CpNode } from '../../cp-node';
+import { getLeaves } from '../get-leaves.js';
+import { CpNode } from '../../cp-node.js';
 
 
 /**

package/src/mat/to-scale-axis/cull.ts

@@ -1,7 +1,6 @@
-
-import { Circle } from '../../circle';
-import { getLeaves } from '../get-leaves';
-import { CpNode } from '../../cp-node';
+import { Circle } from '../../circle.js';
+import { getLeaves } from '../get-leaves.js';
+import { CpNode } from '../../cp-node.js';
 
 
 /**

package/src/mat/to-scale-axis/get-engulfed-vertices.ts

@@ -1,7 +1,6 @@
-
-import { Circle, scaleCircle, engulfsCircle } from '../../circle';
-import { TTree } from './t-tree';
-import { calcGroups } from './calc-groups';
+import { Circle, scaleCircle, engulfsCircle } from '../../circle.js';
+import { TTree } from './t-tree.js';
+import { calcGroups } from './calc-groups.js';
 
 
 /** @hidden */

package/src/mat/to-scale-axis/t-tree.ts

@@ -1,5 +1,4 @@
-
-import { Circle } from '../../circle';
+import { Circle } from '../../circle.js';
 
 
 /** @hidden */

package/src/mat/to-scale-axis/traverse-spacial-tree.ts

@@ -1,7 +1,5 @@
-
-import { Circle } from '../../circle';
-
-import { TTree } from './t-tree';
+import { Circle } from '../../circle.js';
+import { TTree } from './t-tree.js';
 
 
 /**

package/src/mat/trim-mat.ts

@@ -1,8 +1,7 @@
-
-import { Mat } from '../mat';
-import { createNewCpTree } from './create-new-cp-tree';
-import { cullNonCycles } from './to-scale-axis/cull-non-cycles';
-import { clone } from '../cp-node/clone';
+import { Mat } from '../mat.js';
+import { createNewCpTree } from './create-new-cp-tree.js';
+import { cullNonCycles } from './to-scale-axis/cull-non-cycles.js';
+import { clone } from '../cp-node/clone.js';
 
 
 /**

package/src/mat.ts

@@ -1,8 +1,6 @@
-
-import LlRbTree from "flo-ll-rb-tree";
-
-import { CpNode } from "./cp-node";
-import { Loop   } from './loop';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { CpNode } from './cp-node.js';
+import { Loop   } from './loop.js';
 
 
 /**

package/src/point-on-shape.ts

@@ -1,10 +1,8 @@
-
 import { dot, fromTo, toUnitVector, rotateNeg90Degrees } from 'flo-vector2d';
 import { memoize } from 'flo-memoize';
-import { normal, κ as curvature, evalDeCasteljau }   from 'flo-bezier3';
-
-import { Curve, getCornerAtEnd } from './curve'
-import { Circle } from './circle';
+import { curvature, evalDeCasteljau, tangent }   from 'flo-bezier3';
+import { Curve, getCornerAtEnd } from './curve.js';
+import { Circle } from './circle.js';
 
 
 interface IPointOnShape {
@@ -174,11 +172,11 @@ let calcOsculatingCircleRadius = memoize((pos: IPointOnShape) => {
     let ps = pos.curve.ps;
     let t  = pos.t;
 
-    let κ = -curvature(ps, t); 
+    let c = -curvature(ps, t); 
 
-    // κ > 0 => bending inwards
+    // c > 0 => bending inwards
 
-    return 1/κ;
+    return 1/c;
 });
 
 
@@ -192,7 +190,6 @@ function getOsculatingCircle(
         maxOsculatingCircleRadius: number, 
         pos: IPointOnShape): Circle {
 
-    //if (PointOnShape.isSharpCorner(pos)) {
     if (isPosSharpCorner(pos)) {
         return { center: pos.p, radius: 0 };
     }
@@ -208,11 +205,12 @@ function getOsculatingCircle(
     let ps = pos.curve.ps;
     let t  = pos.t;
     
-    let normal_ = toUnitVector(normal(ps,t));
+    const tangent_ = tangent(ps,t);
+    let normal_ = toUnitVector([-tangent_[1],tangent_[0]]);
     let p = evalDeCasteljau(ps,t);
     let circleCenter = [
-        p[0] + normal_[0]*radius, 
-        p[1] + normal_[1]*radius
+        p[0] - normal_[0]*radius,
+        p[1] - normal_[1]*radius
     ];
 
     return { center: circleCenter, radius };

package/src/simplify-mat.ts

@@ -1,12 +1,9 @@
-
-import { CpNode } from "./cp-node";
-import { getBranches } from "./get-branches";
-import { hausdorffDistance, toCubic } from "flo-bezier3";
-import { getCurveToNext } from "./get-curve-to-next";
-import { getCurveBetween } from "./get-curve/get-curve-between";
-import { Mat } from "./mat";
-import { createNewCpTree } from "./mat/create-new-cp-tree";
-import { closestPointOnBezier } from "flo-bezier3/node/simultaneous-properties/closest-point-on-bezier/closest-point-on-bezier";
+import { hausdorffDistance } from 'flo-bezier3';
+import { CpNode } from './cp-node.js';
+import { getBranches } from './get-branches.js';
+import { getCurveToNext } from './get-curve-to-next.js';
+import { getCurveBetween } from './get-curve/get-curve-between.js';
+import { Mat } from './mat.js';
 
 
 /**
@@ -16,16 +13,17 @@ import { closestPointOnBezier } from "flo-bezier3/node/simultaneous-properties/c
  * @param anlgeTolerance Tolerance given as the degrees difference of the unit 
  * direction vectors at the interface between curves. A tolerance of zero means
  * perfect smoothness is required - defaults to 15.
+ * TODO - the next two params are wrong??
  * @param hausdorffTolerance The approximate maximum Hausdorff Distance tolerance -
  * defaults to 0.1
- * @param hausdorffSpacing The spacing on the curves used to calculate the Hausdorff
+ * @param maxIterations The spacing on the curves used to calculate the Hausdorff
  * Distance - defaults to 1
  */
 function simplifyMat(
         mat: Mat,
         anlgeTolerance = 15,
-        hausdorffTolerance = 1e-1,
-        hausdorffSpacing = 1e0): Mat {
+        hausdorffTolerance = 2**-3,
+        maxIterations = 50): Mat {
 
     let cpNode = mat.cpNode;
     
@@ -47,7 +45,7 @@ function simplifyMat(
 
                 if (j === branch.length) { break; }
 
-                let hd = getTotalHausdorffDistance(i, j, branch, hausdorffSpacing);
+                let hd = getTotalHausdorffDistance(i, j, branch, maxIterations);
 
                 if (hd > hausdorffTolerance) {
                     break;

package/src/svg/get-curvature-at-interface.ts

@@ -1,9 +1,7 @@
-
 // TODO - move to another library
-
 import { tangent } from 'flo-bezier3';
 import { dot, cross, toUnitVector } from 'flo-vector2d';
-import { Curve } from '../curve';
+import { Curve } from '../curve.js';
 
 
 /**

package/src/svg/get-extreme.ts

@@ -1,6 +1,5 @@
-
-import { Loop } from '../loop';
-import { getShapeBounds } from './get-shape-bounds';
+import { Loop } from '../loop.js';
+import { getShapeBounds } from './get-shape-bounds.js';
 
 
 /**

package/src/svg/get-loop-bounds.ts

@@ -1,9 +1,8 @@
-
 import { getBounds } from 'flo-bezier3';
-import { Loop } from '../loop';
-import { Curve } from '../curve';
-import { PointOnShape, IPointOnShape } from '../point-on-shape';
 import { memoize } from 'flo-memoize';
+import { Loop } from '../loop.js';
+import { Curve } from '../curve.js';
+import { PointOnShape, IPointOnShape } from '../point-on-shape.js';
 
 
 /** @hidden */
@@ -36,6 +35,7 @@ let getLoopBounds = memoize(function(loop: Loop): {
 	
 	loop.curves.forEach(function(curve: Curve): void {			
 		let ps = curve.ps; 
+		// let bounds = getBounds_(ps);
 		let bounds = getBounds(ps);
 		
 		

package/src/svg/get-min-y-pos.ts

@@ -1,10 +1,6 @@
-
 /** @hidden */
-declare var _debug_: Debug; 
-
-import { Debug }   from '../debug/debug';
-import { Loop } from '../loop';
-import { getLoopBounds } from './get-loop-bounds';
+import { Loop } from '../loop.js';
+import { getLoopBounds } from './get-loop-bounds.js';
 
 
 /**

package/src/svg/get-shape-bounds.ts

@@ -1,7 +1,6 @@
-
 import { memoize } from 'flo-memoize';
-import { Loop } from '../loop';
-import { getLoopBounds } from './get-loop-bounds';
+import { Loop } from '../loop.js';
+import { getLoopBounds } from './get-loop-bounds.js';
 
 
 // TODO - move to another library

package/src/sweep-line/are-boxes-intersecting.ts

@@ -9,7 +9,7 @@
  * contain their border) or open.
  */
 function areBoxesIntersecting(closed: boolean) {
-    return (a: number[][], b: number[][]) => {
+    return (a: number[][], b: number[][]): boolean => {
 
         let [[ax0, ay0],[ax1, ay1]] = a;
         let [[bx0, by0],[bx1, by1]] = b;

package/src/to-scale-axis.ts

@@ -1,21 +1,20 @@
-
 /** @hidden */
 declare var _debug_: Debug;
 
-import { Debug } from './debug/debug';
 import { length } from 'flo-bezier3';
-import { CpNode } from './cp-node';
-import { Circle } from './circle';
-import { Mat } from './mat';
-import { traverseEdges } from './traverse-edges';
-import { traverseVertices } from './traverse-vertices';
-import { getLargestVertex } from './mat/get-largest-vertex';
-import { createNewCpTree } from './mat/create-new-cp-tree';
-import { getLeaves } from './mat/get-leaves';
-import { cull } from './mat/to-scale-axis/cull';
-import { addDebugInfo } from './mat/to-scale-axis/add-debug-info';
-import { clone } from './cp-node/clone';
-import { getCurveToNext } from './get-curve-to-next';
+import { Debug } from './debug/debug.js';
+import { CpNode } from './cp-node.js';
+import { Circle } from './circle.js';
+import { Mat } from './mat.js';
+import { traverseEdges } from './traverse-edges.js';
+import { traverseVertices } from './traverse-vertices.js';
+import { getLargestVertex } from './mat/get-largest-vertex.js';
+import { createNewCpTree } from './mat/create-new-cp-tree.js';
+import { getLeaves } from './mat/get-leaves.js';
+import { cull } from './mat/to-scale-axis/cull.js';
+import { addDebugInfo } from './mat/to-scale-axis/add-debug-info.js';
+import { clone } from './cp-node/clone.js';
+import { getCurveToNext } from './get-curve-to-next.js';
 
 
 function linearScale(s: number) {
@@ -26,7 +25,7 @@ function linearScale(s: number) {
 
 
 /** @hidden */
-let len = length([0,1]);
+//let len = length([0,1]);
 
 
 /**
@@ -80,7 +79,7 @@ function toScaleAxis(
 
 		let cpNode_ = cpNode.next;
 
-		let l = len(getCurveToNext(cpNode));
+		let l = length([0,1], getCurveToNext(cpNode));
 
 		let r = cpNode_.cp.circle.radius;
 		let r_ = f_(r);

package/src/traverse-edges.ts

@@ -1,5 +1,4 @@
-
-import { CpNode } from './cp-node';
+import { CpNode } from './cp-node.js';
 
 
 /**

package/src/traverse-vertices.ts

@@ -1,5 +1,4 @@
-
-import { CpNode } from './cp-node';
+import { CpNode } from './cp-node.js';
 
 
 /**

package/test/lib-load.spec.ts

@@ -1,4 +1,3 @@
-
 import { describe } from 'mocha';
 import { assert, expect } from 'chai';
 import { findMats } from '../node/index.js';