svg-path-simplify 0.4.4 → 0.4.5

package/dist/svg-path-simplify.js

@@ -1855,7 +1855,7 @@
 
       let len = pathData.length;
       let decimals = decimalsGlobal;
-      let decimalsArc = decimals < 3 ? decimals+2 : decimals;
+      let decimalsArc = decimals < 3 ? decimals + 2 : decimals;
 
       for (let c = 0; c < len; c++) {
           let com = pathData[c];
@@ -1915,23 +1915,47 @@
 
               dimA = dimA ? dimA : getDistManhattan(p0, p);
 
-              if (dimA) dims.push(dimA);
+              if (dimA) dims.push(+dimA.toFixed(8));
 
           }
 
       }
 
-      let dim_min = dims.sort();
+     dims = dims.sort();
+     let len = dims.length;
+     let dim_mid = dims[Math.floor(len*0.5)];
+
+     // smallest 25% of values
+     let idx_q = Math.ceil(len*0.25);
+     let dims_min = dims.slice(0, idx_q);
+
+     // average smallest values with mid value
+     let dim_min = ((dims_min.reduce((a, b) => a + b, 0) / idx_q)  + dim_mid) * 0.5;
+
+     let threshold = 75;
+     let decimalsAuto = dim_min > threshold * 1.5 ? 0 : Math.floor(threshold / dim_min).toString().length;
+
+     // clamp
+     return Math.min(Math.max(0, decimalsAuto), 8)
+
+      /*
+      let dim_min = dims.sort()
 
-      let sliceIdx = Math.ceil(dim_min.length / 6);
+      let dim_mid = dim_min[Math.floor(dim_min.length*0.5)]
+
+      let sliceIdx = Math.ceil(dim_min.length / 4);
       dim_min = dim_min.slice(0, sliceIdx);
       let minVal = dim_min.reduce((a, b) => a + b, 0) / sliceIdx;
 
-      let threshold = 75;
-      let decimalsAuto = minVal > threshold * 1.5 ? 0 : Math.floor(threshold / minVal).toString().length;
+      // average with mid value
+      minVal = (minVal+dim_mid)*0.5
+
+      let threshold = 75
+      let decimalsAuto = minVal > threshold * 1.5 ? 0 : Math.floor(threshold / minVal).toString().length
 
       // clamp
       return Math.min(Math.max(0, decimalsAuto), 8)
+      */
 
   }
 
@@ -2497,7 +2521,7 @@
       attributes.forEach(att=>{
 
           let value = normalizeUnits(el.getAttribute(att), {x, y, width, height});   
-          atts[att.name] = value;
+          atts[att] = value;
       });
 
       return atts
@@ -3242,7 +3266,7 @@
                       error += com.error;
 
                       // find next candidates
-                      for (let n = i + 1; error < tolerance && n < l; n++) {
+                      for (let n = i + offset; error < tolerance && n < l; n++) {
                           let comN = pathData[n];
 
                           if (comN.type !== 'C' ||
@@ -3252,6 +3276,7 @@
                                   (keepExtremes && com.extreme)
                               )
                           ) {
+
                               break
                           }
 
@@ -3259,6 +3284,7 @@
 
                           // failure - could not be combined - exit loop
                           if (combined.length > 1) {
+
                               break
                           }
 
@@ -3272,6 +3298,7 @@
 
                           // return combined
                           com = combined[0];
+
                       }
 
                       pathDataN.push(com);
@@ -3385,11 +3412,19 @@
 
           comS.dimA = getDistManhattan(comS.p0, comS.p);
           comS.type = 'C';
+
           comS.extreme = com2.extreme;
           comS.directionChange = com2.directionChange;
-
           comS.corner = com2.corner;
 
+          if (comS.extreme || comS.corner) ;
+
+          /*
+          comS.extreme = com1.extreme;
+          comS.directionChange = com1.directionChange;
+          comS.corner = com1.corner;
+          */
+
           comS.values = [comS.cp1.x, comS.cp1.y, comS.cp2.x, comS.cp2.y, comS.p.x, comS.p.y];
 
           // relative error
@@ -6558,7 +6593,8 @@
           let { type, values } = com;
           let valsLen = values.length;
           if (valsLen) {
-              let p = { type: type, x: values[valsLen - 2], y: values[valsLen - 1], index: 0 };
+              // we need rounding otherwise sorting may crash due to e notation
+              let p = { type: type, x: +values[valsLen - 2].toFixed(8), y: +values[valsLen - 1].toFixed(8), index: 0 };
               p.index = i;
               indices.push(p);
           }
@@ -6566,7 +6602,7 @@
 
       // reorder  to top left most
 
-      indices = indices.sort((a, b) => +a.y.toFixed(8) - +b.y.toFixed(8) || a.x - b.x);
+      indices = indices.sort((a, b) => a.y - b.y || a.x - b.x);
       newIndex = indices[0].index;
 
       return newIndex ? shiftSvgStartingPoint(pathData, newIndex) : pathData;
@@ -7102,7 +7138,7 @@
   } = {}) {
 
       // is stringified flat point attribute
-      if(typeof pts === 'string' && !isNaN(pts[0])){
+      if (typeof pts === 'string' && !isNaN(pts[0])) {
           pts = toPointArray(pts.split(/,| /).filter(Boolean).map(Number));
           return pts
       }
@@ -7112,8 +7148,9 @@
       return poly
   }
 
-  function polyArrayToObject(pts) {
+  function polyArrayToObject(pts = []) {
 
+      if (!pts.length) return [];
       // is point object array
       if (pts[0].x !== undefined && pts[0].y !== undefined) return pts
 
@@ -7131,7 +7168,7 @@
           return poly
       }
 
-      else if(pts.length>3){
+      else if (pts.length > 3) {
           pts = toPointArray(pts);
           return pts
       }
@@ -7160,13 +7197,13 @@
   function toPointArray(pts) {
       let ptArr = [];
 
-      if(pts[0].length===2){
-          for (let i = 0, l = pts.length; i < l; i ++) {
+      if (pts[0].length === 2) {
+          for (let i = 0, l = pts.length; i < l; i++) {
               let pt = pts[i];
-              ptArr.push({ x: pt[0], y:pt[1] });
+              ptArr.push({ x: pt[0], y: pt[1] });
           }
 
-      }else {
+      } else {
           for (let i = 1, l = pts.length; i < l; i += 2) {
               ptArr.push({ x: pts[i - 1], y: pts[i] });
           }
@@ -8008,7 +8045,6 @@
 
   // LG weight/abscissae generator
   function getLegendreGaussValues(n, x1 = -1, x2 = 1) {
-      console.log('add new LG', n);
 
       let waArr = [];
       let z1, z, xm, xl, pp, p3, p2, p1;
@@ -8485,7 +8521,7 @@
       let prop = props[i];
 
       if (styleProps[prop] !== undefined) {
-        styleProps[prop] = styleProps[prop].map(val => round ? roundTo(val * scale, 2) : val * scale);
+        styleProps[prop] = styleProps[prop].map(val => round ? roundTo(val * scale, 3) : val * scale);
       }
     }
     return styleProps
@@ -8506,6 +8542,7 @@
               });
 
               let scale = elLength / pathLength;
+
               styleProps = scaleProps(styleProps, { props: ['stroke-dasharray', 'stroke-dashoffset'], scale });
 
               // set absolute
@@ -9034,9 +9071,13 @@
       let stylePropsFiltered = {};
 
       // convert pathLength before transforming
-      if (convertPathLength) {
+      if(convertTransforms || attributesToGroup) convertPathLength=true;
+
+      if (convertPathLength ) {
+
         styleProps = convertPathLengthAtt(el, { styleProps });
         remove = [...new Set([...remove, ...styleProps.remove])];
+
       }
 
       // get parent styles
@@ -9214,7 +9255,7 @@
 
         // scale props like stroke width or dash-array before conversion
         if (matrix && transComponents) {
-          ['stroke-width', 'stroke-dasharray'].forEach(att => {
+          ['stroke-width', 'stroke-dasharray', 'stroke-dashoffset'].forEach(att => {
             let attVal = el.getAttribute(att);
             let vals = attVal ? attVal.split(' ').filter(Boolean).map(Number).map(val => val * transComponents.scaleX) : [];
             if (vals.length) el.setAttribute(att, vals.join(' '));
@@ -12345,7 +12386,6 @@
               addViewBox: true,
               removeDimensions: true,
               removeOffCanvas: true,
-
               /*
               */
           }
@@ -12532,11 +12572,11 @@
               original: 0,
               new: 0,
               saved: 0,
-              svgSize:0,
-              svgSizeOpt:0,
-              compression:0,
-              decimals:0,
-              invalid:true
+              svgSize: 0,
+              svgSizeOpt: 0,
+              compression: 0,
+              decimals: 0,
+              invalid: true
           };
 
           return { svg: dummySVG, d: '', polys: [], report, pathDataPlusArr: [], pathDataPlusArr_global: [], inputType: 'invalid', dOriginal: '' };
@@ -12706,6 +12746,12 @@
           let { d, el } = path;
           let isPoly = false;
 
+          // disable reordering for elements with stroke dash-array
+          if (el && (el.hasAttribute('stroke-dasharray') || el.hasAttribute('stroke-dashoffset'))) {
+              optimizeOrder = false;
+
+          }
+
           // if polygon we already heave absolute coordinates
 
           let pathData = parsePathDataNormalized(d, { quadraticToCubic, arcToCubic });