makerjs 0.17.3 → 0.17.5

package/dist/browser.maker.js

@@ -39,7 +39,7 @@ and limitations under the License.
  *   author: Dan Marshall / Microsoft Corporation
  *   maintainers: Dan Marshall <danmar@microsoft.com>
  *   homepage: https://maker.js.org
- *   version: 0.17.3
+ *   version: 0.17.5
  *
  * browserify:
  *   license: MIT (http://opensource.org/licenses/MIT)
@@ -4104,8 +4104,21 @@ var MakerJs;
                 //lines are both vertical, see if x are the same
                 return MakerJs.round(slopeA.line.origin[0] - slopeB.line.origin[0]) == 0;
             }
-            //lines are parallel, but not vertical, see if y-intercept is the same
-            return MakerJs.round(slopeA.yIntercept - slopeB.yIntercept, .00001) == 0;
+            //lines are parallel, but not vertical
+            //create array of slopes
+            var slopes = [slopeA, slopeB];
+            //get angle of each line
+            var angles = slopes.map(function (s) { return MakerJs.angle.toDegrees(Math.atan(s.slope)); });
+            //create an array of each line cloned
+            var lines = slopes.map(function (s) { return MakerJs.path.clone(s.line); });
+            //use the first line as the rotation origin
+            var origin = lines[0].origin;
+            //rotate each line to flat
+            lines.forEach(function (l, i) { return MakerJs.path.rotate(l, -angles[i], origin); });
+            //get average y-intercept of each line
+            var averageYs = lines.map(function (l) { return (l.origin[1] + l.end[1]) / 2; });
+            //see if y-intercept is the same
+            return MakerJs.round(averageYs[0] - averageYs[1], .00001) == 0;
         }
         measure.isSlopeEqual = isSlopeEqual;
         /**
@@ -8384,10 +8397,12 @@ var MakerJs;
             cpa.sort(function (a, b) { return a.xRatio - b.xRatio; });
             var first = cpa[0];
             var last = cpa[cpa.length - 1];
-            var min = first.xRatio;
-            var max = last.xRatio;
-            var span = max - min;
-            cpa.forEach(function (cp) { return cp.xRatio = (cp.xRatio - min) / span; });
+            if (cpa.length > 1) {
+                var min = first.xRatio;
+                var max = last.xRatio;
+                var span = max - min;
+                cpa.forEach(function (cp) { return cp.xRatio = (cp.xRatio - min) / span; });
+            }
             return {
                 cpa: cpa,
                 firstX: xMap[first.childId],
@@ -8440,7 +8455,7 @@ var MakerJs;
             var result = getChildPlacement(parentModel, baseline);
             var cpa = result.cpa;
             var chosenPath = onPath;
-            if (contain) {
+            if (contain && cpa.length > 1) {
                 //see if we need to clip
                 var onPathLength = MakerJs.measure.pathLength(onPath);
                 if (result.firstX + result.lastX < onPathLength) {
@@ -8502,35 +8517,52 @@ var MakerJs;
             var result = getChildPlacement(parentModel, baseline);
             var cpa = result.cpa;
             var chainLength = onChain.pathLength;
-            if (contain)
-                chainLength -= result.firstX + result.lastX;
-            var absolutes = cpa.map(function (cp) { return (reversed ? 1 - cp.xRatio : cp.xRatio) * chainLength; });
-            var relatives;
-            if (reversed)
-                absolutes.reverse();
-            relatives = absolutes.map(function (ab, i) { return Math.abs(ab - (i == 0 ? 0 : absolutes[i - 1])); });
-            if (contain) {
-                relatives[0] += reversed ? result.lastX : result.firstX;
+            var points;
+            if (cpa.length > 1) {
+                if (contain)
+                    chainLength -= result.firstX + result.lastX;
+                var absolutes = cpa.map(function (cp) { return (reversed ? 1 - cp.xRatio : cp.xRatio) * chainLength; });
+                var relatives;
+                if (reversed)
+                    absolutes.reverse();
+                relatives = absolutes.map(function (ab, i) { return Math.abs(ab - (i == 0 ? 0 : absolutes[i - 1])); });
+                if (contain) {
+                    relatives[0] += reversed ? result.lastX : result.firstX;
+                }
+                else {
+                    relatives.shift();
+                }
+                //chain.toPoints always follows the chain in its order, from beginning to end. This is why we needed to contort the points input
+                points = MakerJs.chain.toPoints(onChain, relatives);
+                if (points.length < cpa.length) {
+                    //add last point of chain, since our distances exceeded the chain
+                    var endLink = onChain.links[onChain.links.length - 1];
+                    points.push(endLink.endPoints[endLink.reversed ? 0 : 1]);
+                }
+                if (contain)
+                    points.shift(); //delete the first point which is the beginning of the chain
             }
             else {
-                relatives.shift();
+                //get the first point and the middle point of the chain
+                points = MakerJs.chain.toPoints(onChain, 0.5 * chainLength);
+                points.length = 2;
+                //add the last point of the chain
+                points.push(onChain.links[onChain.links.length - 1].endPoints[onChain.links[onChain.links.length - 1].reversed ? 0 : 1]);
             }
-            //chain.toPoints always follows the chain in its order, from beginning to end. This is why we needed to contort the points input
-            var points = MakerJs.chain.toPoints(onChain, relatives);
-            if (points.length < cpa.length) {
-                //add last point of chain, since our distances exceeded the chain
-                var endLink = onChain.links[onChain.links.length - 1];
-                points.push(endLink.endPoints[endLink.reversed ? 0 : 1]);
-            }
-            if (contain)
-                points.shift(); //delete the first point which is the beginning of the chain
             if (reversed)
                 points.reverse();
             var angles = miterAngles(points, -90);
-            cpa.forEach(function (cp, i) {
-                cp.angle = angles[i];
-                cp.origin = points[i];
-            });
+            if (cpa.length > 1) {
+                cpa.forEach(function (cp, i) {
+                    cp.angle = angles[i];
+                    cp.origin = points[i];
+                });
+            }
+            else {
+                //use the middle point
+                cpa[0].angle = angles[1];
+                cpa[0].origin = points[1];
+            }
             moveAndRotate(parentModel, cpa, rotated);
             return parentModel;
         }
@@ -10286,6 +10318,6 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.17.3";
+MakerJs.version = "0.17.5";
 
 },{"clone":2,"graham_scan":3,"kdbush":4}]},{},[]);

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Maker.js 0.17.3
+// Type definitions for Maker.js 0.17.5
 // Project: https://github.com/Microsoft/maker.js
 // Definitions by: Dan Marshall <https://github.com/danmarshall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped

package/dist/index.js

@@ -3687,8 +3687,21 @@ var MakerJs;
                 //lines are both vertical, see if x are the same
                 return MakerJs.round(slopeA.line.origin[0] - slopeB.line.origin[0]) == 0;
             }
-            //lines are parallel, but not vertical, see if y-intercept is the same
-            return MakerJs.round(slopeA.yIntercept - slopeB.yIntercept, .00001) == 0;
+            //lines are parallel, but not vertical
+            //create array of slopes
+            var slopes = [slopeA, slopeB];
+            //get angle of each line
+            var angles = slopes.map(function (s) { return MakerJs.angle.toDegrees(Math.atan(s.slope)); });
+            //create an array of each line cloned
+            var lines = slopes.map(function (s) { return MakerJs.path.clone(s.line); });
+            //use the first line as the rotation origin
+            var origin = lines[0].origin;
+            //rotate each line to flat
+            lines.forEach(function (l, i) { return MakerJs.path.rotate(l, -angles[i], origin); });
+            //get average y-intercept of each line
+            var averageYs = lines.map(function (l) { return (l.origin[1] + l.end[1]) / 2; });
+            //see if y-intercept is the same
+            return MakerJs.round(averageYs[0] - averageYs[1], .00001) == 0;
         }
         measure.isSlopeEqual = isSlopeEqual;
         /**
@@ -7967,10 +7980,12 @@ var MakerJs;
             cpa.sort(function (a, b) { return a.xRatio - b.xRatio; });
             var first = cpa[0];
             var last = cpa[cpa.length - 1];
-            var min = first.xRatio;
-            var max = last.xRatio;
-            var span = max - min;
-            cpa.forEach(function (cp) { return cp.xRatio = (cp.xRatio - min) / span; });
+            if (cpa.length > 1) {
+                var min = first.xRatio;
+                var max = last.xRatio;
+                var span = max - min;
+                cpa.forEach(function (cp) { return cp.xRatio = (cp.xRatio - min) / span; });
+            }
             return {
                 cpa: cpa,
                 firstX: xMap[first.childId],
@@ -8023,7 +8038,7 @@ var MakerJs;
             var result = getChildPlacement(parentModel, baseline);
             var cpa = result.cpa;
             var chosenPath = onPath;
-            if (contain) {
+            if (contain && cpa.length > 1) {
                 //see if we need to clip
                 var onPathLength = MakerJs.measure.pathLength(onPath);
                 if (result.firstX + result.lastX < onPathLength) {
@@ -8085,35 +8100,52 @@ var MakerJs;
             var result = getChildPlacement(parentModel, baseline);
             var cpa = result.cpa;
             var chainLength = onChain.pathLength;
-            if (contain)
-                chainLength -= result.firstX + result.lastX;
-            var absolutes = cpa.map(function (cp) { return (reversed ? 1 - cp.xRatio : cp.xRatio) * chainLength; });
-            var relatives;
-            if (reversed)
-                absolutes.reverse();
-            relatives = absolutes.map(function (ab, i) { return Math.abs(ab - (i == 0 ? 0 : absolutes[i - 1])); });
-            if (contain) {
-                relatives[0] += reversed ? result.lastX : result.firstX;
+            var points;
+            if (cpa.length > 1) {
+                if (contain)
+                    chainLength -= result.firstX + result.lastX;
+                var absolutes = cpa.map(function (cp) { return (reversed ? 1 - cp.xRatio : cp.xRatio) * chainLength; });
+                var relatives;
+                if (reversed)
+                    absolutes.reverse();
+                relatives = absolutes.map(function (ab, i) { return Math.abs(ab - (i == 0 ? 0 : absolutes[i - 1])); });
+                if (contain) {
+                    relatives[0] += reversed ? result.lastX : result.firstX;
+                }
+                else {
+                    relatives.shift();
+                }
+                //chain.toPoints always follows the chain in its order, from beginning to end. This is why we needed to contort the points input
+                points = MakerJs.chain.toPoints(onChain, relatives);
+                if (points.length < cpa.length) {
+                    //add last point of chain, since our distances exceeded the chain
+                    var endLink = onChain.links[onChain.links.length - 1];
+                    points.push(endLink.endPoints[endLink.reversed ? 0 : 1]);
+                }
+                if (contain)
+                    points.shift(); //delete the first point which is the beginning of the chain
             }
             else {
-                relatives.shift();
+                //get the first point and the middle point of the chain
+                points = MakerJs.chain.toPoints(onChain, 0.5 * chainLength);
+                points.length = 2;
+                //add the last point of the chain
+                points.push(onChain.links[onChain.links.length - 1].endPoints[onChain.links[onChain.links.length - 1].reversed ? 0 : 1]);
             }
-            //chain.toPoints always follows the chain in its order, from beginning to end. This is why we needed to contort the points input
-            var points = MakerJs.chain.toPoints(onChain, relatives);
-            if (points.length < cpa.length) {
-                //add last point of chain, since our distances exceeded the chain
-                var endLink = onChain.links[onChain.links.length - 1];
-                points.push(endLink.endPoints[endLink.reversed ? 0 : 1]);
-            }
-            if (contain)
-                points.shift(); //delete the first point which is the beginning of the chain
             if (reversed)
                 points.reverse();
             var angles = miterAngles(points, -90);
-            cpa.forEach(function (cp, i) {
-                cp.angle = angles[i];
-                cp.origin = points[i];
-            });
+            if (cpa.length > 1) {
+                cpa.forEach(function (cp, i) {
+                    cp.angle = angles[i];
+                    cp.origin = points[i];
+                });
+            }
+            else {
+                //use the middle point
+                cpa[0].angle = angles[1];
+                cpa[0].origin = points[1];
+            }
             moveAndRotate(parentModel, cpa, rotated);
             return parentModel;
         }
@@ -9869,5 +9901,5 @@ var MakerJs;
         ];
     })(models = MakerJs.models || (MakerJs.models = {}));
 })(MakerJs || (MakerJs = {}));
-MakerJs.version = "0.17.3";
+MakerJs.version = "0.17.5";
 var Bezier = require('bezier-js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "makerjs",
-  "version": "0.17.3",
+  "version": "0.17.5",
   "description": "Maker.js, a Microsoft Garage project, is a JavaScript library for creating and sharing modular line drawings for CNC and laser cutters.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",