merge plugins/roundNumericValues and plugins/removeDefaultPx into one…

… plugins/cleanupNumericValues

.svgo.yml

@@ -32,16 +32,13 @@ plugins:
     active: true
     type: perItem
 
-  - name: removeDefaultPx
-    active: true
-    type: perItem
-
-  - name: roundNumericValues
+  - name: cleanupNumericValues
     active: true
     type: perItem
     params:
       floatPrecision: 3
       leadingZero: true
+      defaultPx: true
 
   - name: removeUnknownsAndDefaults
     active: true

plugins/roundNumericValues.js → plugins/cleanupNumericValues.js

@@ -4,15 +4,16 @@ var regNumericValues = /^([\-+]?\d*\.?\d+)(px|pt|pc|mm|cm|m|in|ft|em|ex|%)?$/,
     removeLeadingZero = require('../lib/svgo/tools').removeLeadingZero;
 
 /**
- * Round numeric values to the fixed precision.
+ * Round numeric values to the fixed precision,
+ * remove default 'px' units.
  *
  * @param {Object} item current iteration item
  * @param {Object} params plugin params
  * @return {Boolean} if false, item will be filtered out
  *
  * @author Kir Belevich
  */
-exports.roundNumericValues = function(item, params) {
+exports.cleanupNumericValues = function(item, params) {
 
     if (item.isElem()) {
 
@@ -23,15 +24,21 @@ exports.roundNumericValues = function(item, params) {
 
             // if attribute value matches regNumericValues
             if (match) {
-                // then round it to the fixed precision
-                var num = +(+match[1]).toFixed(params.floatPrecision) + (match[2] || '');
+                    // round it to the fixed precision
+                var num = +(+match[1]).toFixed(params.floatPrecision),
+                    units = match[2] || '';
 
                 // and remove leading zero
                 if (params.leadingZero) {
                     num = removeLeadingZero(num);
                 }
 
-                attr.value = num;
+                // remove default 'px' units
+                if (params.defaultPx && units === 'px') {
+                    units = '';
+                }
+
+                attr.value = num + units;
             }
         });