Create ID from path hash to cut down on duplicate <defs>

gliffy · Mar 12, 2018 · 8b9ecdb · 8b9ecdb
1 parent cfbd8ef
commit 8b9ecdb
Showing 1 changed file with 24 additions and 15 deletions.
diff --git a/canvas2svg.js b/canvas2svg.js
@@ -780,31 +780,25 @@
         if (arguments[0] === "evenodd" || arguments[1] === "evenodd") {
             element.setAttribute("fill-rule", "evenodd");
         }
-
-        this.__applyStyleToCurrentElement("fill");
-        this.__applyTransform(element, "fill");
     };
 
     /**
      * Sets the stroke property on the current element
      */
     ctx.prototype.stroke = function () {
         var element = getOrCreateElementToApplyStyleTo.call(this, "stroke", "fill");
-
-        this.__applyStyleToCurrentElement("stroke");
-        this.__applyTransform(element, "stroke");
     };
 
     function getOrCreateElementToApplyStyleTo(paint1, paint2) {
         var element = this.__currentElement;
         var matrixString = this.__currentMatrix.toString();
 
-		var currentPath = this.__currentDefaultPath;
+        var currentPath = this.__currentDefaultPath;
         var group = this.__closestGroupOrSvg();
         var extras = group.__extras || (group.__extras = {})
 
-		var isPath = element.nodeName === "path";
-		if (extras[paint1] || extras[paint2] && extras.matrixString !== matrixString) {
+        var isPath = element.nodeName === "path";
+        if (extras[paint1] || extras[paint2] && extras.matrixString !== matrixString) {
             var pathHasNotChanged = currentPath === extras.currentPath;
             if (pathHasNotChanged) {
                 if (isPath) {
@@ -826,18 +820,33 @@
         extras.currentPath = currentPath;
         extras.matrixString = matrixString;
 
+        this.__applyStyleToCurrentElement(paint1);
+        this.__applyTransform(element, paint1);
+
         return element;
     };
 
+    function hashString(string) {
+        /** https://github.com/darkskyapp/string-hash **/
+        let hash = 5381;
+        let i = string.length;
+        while (i) hash = (hash * 33) ^ string.charCodeAt(--i);
+        return hash >>> 0;
+    };
+
     function convertPathToDef(group, id) {
         var element = this.__currentElement;
 
-        /** Create <path> <def> **/
-        var id = group.__extras.id = randomString(this.__ids);
-        var link = this.__createElement("path");
-        link.setAttribute("id", id);
-        link.setAttribute("d", element.getAttribute("d"));
-        this.__defs.appendChild(link);
+        /** Create <path> in <defs> **/
+        var extras = group.__extras
+        var id = extras.id
+        if (!id) {
+            id = extras.id = `path-${hashString(extras.currentPath)}`;
+            var link = this.__createElement("path");
+            link.setAttribute("id", id);
+            link.setAttribute("d", element.getAttribute("d"));
+            this.__defs.appendChild(link);
+        }
 
         /** Convert previous <path> to <use> **/
         if (element.nodeName === "path") {