From 999cfbd97c37e2b1de3b2ccc26f5498daf6e2fc8 Mon Sep 17 00:00:00 2001
From: Alex Lockwood <alexjlockwood@gmail.com>
Date: Sun, 29 Oct 2017 00:45:35 -0700
Subject: [PATCH] Convert circles/ellipses to paths (#818)

---
 plugins/convertShapeToPath.js          | 50 ++++++++++++++++++++++++--
 test/plugins/convertShapeToPath.04.svg | 15 ++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 test/plugins/convertShapeToPath.04.svg

diff --git a/plugins/convertShapeToPath.js b/plugins/convertShapeToPath.js
index 6d328049e..907246145 100644
--- a/plugins/convertShapeToPath.js
+++ b/plugins/convertShapeToPath.js
@@ -6,6 +6,10 @@ exports.active = true;
 
 exports.description = 'converts basic shapes to more compact path form';
 
+exports.params = {
+    convertArcs: false
+};
+
 var none = { value: 0 },
     regNumber = /[-+]?(?:\d*\.\d+|\d+\.?)(?:[eE][-+]?\d+)?/g;
 
@@ -22,7 +26,8 @@ var none = { value: 0 },
  *
  * @author Lev Solntsev
  */
-exports.fn = function(item) {
+exports.fn = function(item, params) {
+    var convertArcs = params && params.convertArcs;
 
     if (
         item.isElem('rect') &&
@@ -98,6 +103,47 @@ exports.fn = function(item) {
 
         item.renameElem('path')
             .removeAttr('points');
+    } else if (item.isElem('circle') && convertArcs) {
+
+        var cx = +(item.attr('cx') || none).value;
+        var cy = +(item.attr('cy') || none).value;
+        var r = +(item.attr('r') || none).value;
+        if (isNaN(cx - cy + r)) {
+            return;
+        }
+        var cPathData =
+            'M' + cx  + ' ' + (cy - r) +
+                'A' + r + ' ' + r + ' 0 1 0 ' + cx + ' ' + (cy + r) +
+                'A' + r + ' ' + r + ' 0 1 0 ' + cx + ' ' + (cy - r) +
+                'Z';
+        item.addAttr({
+                name: 'd',
+                value: cPathData,
+                prefix: '',
+                local: 'd',
+        });
+        item.renameElem('path').removeAttr(['cx', 'cy', 'r']);
+
+    } else if (item.isElem('ellipse') && convertArcs) {
+
+        var ecx = +(item.attr('cx') || none).value;
+        var ecy = +(item.attr('cy') || none).value;
+        var rx = +(item.attr('rx') || none).value;
+        var ry = +(item.attr('ry') || none).value;
+        if (isNaN(ecx - ecy + rx - ry)) {
+            return;
+        }
+        var ePathData =
+            'M' + ecx + ' ' + (ecy - ry) +
+                'A' + rx + ' ' + ry + ' 0 1 0 ' + ecx + ' ' + (ecy + ry) +
+                'A' + rx + ' ' + ry + ' 0 1 0 ' + ecx + ' ' + (ecy - ry) +
+                'Z';
+        item.addAttr({
+                name: 'd',
+                value: ePathData,
+                prefix: '',
+                local: 'd',
+        });
+        item.renameElem('path').removeAttr(['cx', 'cy', 'rx', 'ry']);
     }
-
 };
diff --git a/test/plugins/convertShapeToPath.04.svg b/test/plugins/convertShapeToPath.04.svg
new file mode 100644
index 000000000..7589d9bdc
--- /dev/null
+++ b/test/plugins/convertShapeToPath.04.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+    <circle cx="10" cy="10" r="5"/>
+    <ellipse cx="10" cy="10" rx="5" ry="5"/>
+</svg>
+
+@@@
+
+<svg xmlns="http://www.w3.org/2000/svg">
+    <path d="M10 5A5 5 0 1 0 10 15A5 5 0 1 0 10 5Z"/>
+    <path d="M10 5A5 5 0 1 0 10 15A5 5 0 1 0 10 5Z"/>
+</svg>
+
+@@@
+
+{ "convertArcs": true }