From cbeea54c1601e7182e738510ca243781df646d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Wed, 3 Jun 2020 06:55:12 +0200
Subject: [PATCH] Maki Icons: embed via dataurl

---
 package-lock.json       | 5 +++++
 package.json            | 1 +
 src/CategoryOverpass.js | 6 +-----
 src/maki.js             | 6 +++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2bd7fc99..1440e82d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5007,6 +5007,11 @@
         "dom-walk": "^0.1.0"
       }
     },
+    "mini-svg-data-uri": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.2.3.tgz",
+      "integrity": "sha512-zd6KCAyXgmq6FV1mR10oKXYtvmA9vRoB6xPSTUJTbFApCtkefDnYueVR1gkof3KcdLZo1Y8mjF2DFmQMIxsHNQ=="
+    },
     "minimalistic-assert": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
diff --git a/package.json b/package.json
index de243057..7a3fa55c 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "leaflet.polylinemeasure": "git+https://github.com/ppete2/Leaflet.PolylineMeasure.git",
     "md5": "^2.2.1",
     "measure-ts": "^3.3.2",
+    "mini-svg-data-uri": "^1.2.3",
     "modulekit-tabs": "^0.2.2",
     "moment": "^2.18.1",
     "natsort": "^1.0.6",
diff --git a/src/CategoryOverpass.js b/src/CategoryOverpass.js
index ee9d720b..c6ad28b8 100644
--- a/src/CategoryOverpass.js
+++ b/src/CategoryOverpass.js
@@ -209,13 +209,9 @@ CategoryOverpass.prototype.updateAssets = function (div) {
     } else if (src.match(/^(maki|temaki):.*/)) {
       let m = src.match(/^(maki|temaki):([a-z0-9-_]*)(?:\?(.*))?$/)
       if (m) {
-        let span = document.createElement('span')
-        img.parentNode.insertBefore(span, img)
-        img.parentNode.removeChild(img)
-        i--
         maki(m[1], m[2], m[3] ? qs(m[3]) : {}, function (err, result) {
           if (err === null) {
-            span.innerHTML = result
+            img.setAttribute('src', result)
           }
         })
       }
diff --git a/src/maki.js b/src/maki.js
index a370c7dc..e978d7d1 100644
--- a/src/maki.js
+++ b/src/maki.js
@@ -1,3 +1,5 @@
+const svgToDataURI = require('mini-svg-data-uri')
+
 /* global openstreetbrowserPrefix */
 var loadClash = {}
 var cache = {}
@@ -15,7 +17,9 @@ function applyOptions (code, options) {
     }
   }
 
-  return code.replace(/<path/i, '<path style="' + style + '"')
+  let result = code.replace(/<path/i, '<path style="' + style + '"')
+
+  return svgToDataURI(result)
 }
 
 function maki (set, file, options, callback) {