svg-path-simplify 0.4.4 → 0.4.5

package/src/svgii/poly_normalize.js

@@ -5,7 +5,7 @@ export function normalizePoly(pts, {
 } = {}) {
 
     // 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
     }
@@ -16,8 +16,9 @@ export function normalizePoly(pts, {
 }
 
 
-export function polyArrayToObject(pts) {
-
+export function polyArrayToObject(pts = []) {
+    //console.log(pts);
+    if (!pts.length) return [];
     // is point object array
     if (pts[0].x !== undefined && pts[0].y !== undefined) return pts
 
@@ -35,7 +36,7 @@ export function polyArrayToObject(pts) {
         return poly
     }
 
-    else if(pts.length>3){
+    else if (pts.length > 3) {
         pts = toPointArray(pts)
         return pts
     }
@@ -65,13 +66,13 @@ export function polyPtsToArray(pts) {
 export 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] });
         }

package/src/svgii/rounding.js

@@ -19,7 +19,7 @@ export function roundPathData(pathData, decimalsGlobal = -1) {
 
     let len = pathData.length;
     let decimals = decimalsGlobal
-    let decimalsArc = decimals < 3 ? decimals+2 : decimals
+    let decimalsArc = decimals < 3 ? decimals + 2 : decimals
     //decimalsArc = decimals
     //console.log(decimalsArc);
 
@@ -98,25 +98,56 @@ export function detectAccuracy(pathData) {
             //let dimA = +getDistAv(p0, p).toFixed(8)
             //console.log('dimA', dimA, com.dimA, type);
 
-            if (dimA) dims.push(dimA);
+            if (dimA) dims.push(+dimA.toFixed(8));
+            //if (dimA) dims.push(dimA);
             if (dimA && dimA < minDim) minDim = dimA;
             //if (dimA && dimA > maxDim) maxDim = dimA;
         }
 
     }
 
+
+   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()
     //console.log('dim_min', dim_min);
 
-    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;
 
+    // average with mid value
+    minVal = (minVal+dim_mid)*0.5
+    //console.log('minVal', minVal, dim_mid);
+
+
     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)
+    */
 
 }
 

package/src/svgii/svg_cleanup.js

@@ -238,11 +238,16 @@ export function cleanUpSVG(svgMarkup, {
 
 
     // convert pathLength before transforming
-    if (convertPathLength) {
+    if(convertTransforms || attributesToGroup) convertPathLength=true;
+
+    if (convertPathLength ) {
+      //console.log('convertPathLength', convertPathLength, name);
       styleProps = convertPathLengthAtt(el, { styleProps });
       remove = [...new Set([...remove, ...styleProps.remove])];
+
     }
 
+    //console.log(styleProps);
 
     // get parent styles
     let { parentStyleProps = [] } = el;
@@ -442,7 +447,7 @@ export function cleanUpSVG(svgMarkup, {
 
       // 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(' '))
@@ -767,7 +772,7 @@ function removeOffCanvasEls(svg, { x = 0, y = 0, width = 0, height = 0 } = {}) {
   els.forEach(el => {
     //console.log(el);
     let bb = getElBBox(el)
-    //console.log('!!bb', bb);
+    //console.log('!!bb', bb, el);
     let outside = bb.right < bb0.x || bb.bottom < bb0.y || bb.x > bb0.right || bb.y > bb.bottom
     if (outside) el.remove();
   })

package/src/svgii/svg_cleanup_convertPathLength.js

@@ -16,7 +16,10 @@ export function convertPathLengthAtt(el, {
                 props: styleProps
             })
 
+
             let scale = elLength / pathLength
+            //console.log('elLength', elLength, scale);
+
             styleProps = scaleProps(styleProps, { props: ['stroke-dasharray', 'stroke-dashoffset'], scale })
 
             // set absolute
@@ -33,6 +36,8 @@ export function convertPathLengthAtt(el, {
 
     }
 
+    //console.log('pathLength', pathLength);
+    //console.log('styleProps', styleProps );
     return styleProps;
 
 

package/src/svgii/svg_cleanup_normalize_transforms.js

@@ -76,7 +76,7 @@ export function scaleProps(styleProps = {}, { props = [], scale = 1 } = {}, roun
     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