From 491bc187be3182a0d68aa1e34e82ef55b57e6a82 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <pham@topo.tw>
Date: Fri, 25 Oct 2024 00:02:38 +0800
Subject: [PATCH] feat: accept custom element for addMarker()

---
 src/BaseRenderer.mjs            |  8 +-------
 src/BasicLeafletRenderer.mjs    | 16 ++++++++++++----
 src/BasicMaplibreRenderer.mjs   |  7 +++----
 src/BasicOpenlayersRenderer.mjs |  8 ++++----
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/BaseRenderer.mjs b/src/BaseRenderer.mjs
index 5154545..0344081 100644
--- a/src/BaseRenderer.mjs
+++ b/src/BaseRenderer.mjs
@@ -43,13 +43,7 @@ export default class {
   layers = []
   data = []
   aliases = []
-  svgForAnchor = {
-    html: '<svg height="20" width="20" xmlns="http://www.w3.org/2000/svg"> <circle r="8" cx="10" cy="10" fill="red" stroke="white" stroke-width="2" /> </svg>',
-    size: [20, 20],
-    anchor: [10, 10],
-  }
-
-  svgForMarker = {
+  svgPin = {
     html: '<svg display="block" height="41px" width="27px" viewBox="0 0 27 41"><g fill-rule="nonzero"><g transform="translate(3.0, 29.0)" fill="#000000"><ellipse opacity="0.04" cx="10.5" cy="5.80029008" rx="10.5" ry="5.25002273"></ellipse><ellipse opacity="0.04" cx="10.5" cy="5.80029008" rx="10.5" ry="5.25002273"></ellipse><ellipse opacity="0.04" cx="10.5" cy="5.80029008" rx="9.5" ry="4.77275007"></ellipse><ellipse opacity="0.04" cx="10.5" cy="5.80029008" rx="8.5" ry="4.29549936"></ellipse><ellipse opacity="0.04" cx="10.5" cy="5.80029008" rx="7.5" ry="3.81822308"></ellipse><ellipse opacity="0.04" cx="10.5" cy="5.80029008" rx="6.5" ry="3.34094679"></ellipse><ellipse opacity="0.04" cx="10.5" cy="5.80029008" rx="5.5" ry="2.86367051"></ellipse><ellipse opacity="0.04" cx="10.5" cy="5.80029008" rx="4.5" ry="2.38636864"></ellipse></g><g fill="#3FB1CE"><path d="M27,13.5 C27,19.074644 20.250001,27.000002 14.75,34.500002 C14.016665,35.500004 12.983335,35.500004 12.25,34.500002 C6.7499993,27.000002 0,19.222562 0,13.5 C0,6.0441559 6.0441559,0 13.5,0 C20.955844,0 27,6.0441559 27,13.5 Z"></path></g><g opacity="0.25" fill="#000000"><path d="M13.5,0 C6.0441559,0 0,6.0441559 0,13.5 C0,19.222562 6.7499993,27 12.25,34.5 C13,35.522727 14.016664,35.500004 14.75,34.5 C20.250001,27 27,19.074644 27,13.5 C27,6.0441559 20.955844,0 13.5,0 Z M13.5,1 C20.415404,1 26,6.584596 26,13.5 C26,15.898657 24.495584,19.181431 22.220703,22.738281 C19.945823,26.295132 16.705119,30.142167 13.943359,33.908203 C13.743445,34.180814 13.612715,34.322738 13.5,34.441406 C13.387285,34.322738 13.256555,34.180814 13.056641,33.908203 C10.284481,30.127985 7.4148684,26.314159 5.015625,22.773438 C2.6163816,19.232715 1,15.953538 1,13.5 C1,6.584596 6.584596,1 13.5,1 Z"></path></g><g transform="translate(6.0, 7.0)" fill="#FFFFFF"></g><g transform="translate(8.0, 8.0)"><circle fill="#000000" opacity="0.25" cx="5.5" cy="5.5" r="5.4999962"></circle><circle fill="#FFFFFF" cx="5.5" cy="5.5" r="5.4999962"></circle></g></g></svg>',
     size: [27, 41],
     anchor: [13.5, 35.25],
diff --git a/src/BasicLeafletRenderer.mjs b/src/BasicLeafletRenderer.mjs
index c093311..382fc19 100644
--- a/src/BasicLeafletRenderer.mjs
+++ b/src/BasicLeafletRenderer.mjs
@@ -88,12 +88,20 @@ const Renderer = class extends defaultExport {
   }
 
   addMarker (config) {
-    const svg = config.type === 'circle' ? this.svgForAnchor : this.svgForMarker
+    const options = config.element
+      ? {
+          html: config.element,
+          iconSize: config.size,
+          iconAnchor: config.anchor,
+        }
+      : {
+          html: this.svgPin.html,
+          iconSize: this.svgPin.size,
+          iconAnchor: this.svgPin.anchor,
+        }
     const markerIcon = L.divIcon({
-      html: svg.html,
+      ...options,
       className: 'marker',
-      iconSize: svg.size,
-      iconAnchor: svg.anchor,
     })
     const xy = Array.from(config.xy).reverse()
     const marker = L.marker(xy, { icon: markerIcon })
diff --git a/src/BasicMaplibreRenderer.mjs b/src/BasicMaplibreRenderer.mjs
index c2295c6..3ed88b5 100644
--- a/src/BasicMaplibreRenderer.mjs
+++ b/src/BasicMaplibreRenderer.mjs
@@ -118,11 +118,10 @@ const Renderer = class extends defaultExport {
   }
 
   addMarker (config) {
-    const options = config.type === 'circle'
+    const options = config.element
       ? {
-          element: new window.DOMParser()
-            .parseFromString(this.svgForAnchor.html, 'image/svg+xml')
-            .querySelector('svg'),
+          element: config.element,
+          anchor: config.type === 'pin' ? 'bottom' : 'center',
         }
       : {}
     const marker = new this.maplibregl.Marker(options)
diff --git a/src/BasicOpenlayersRenderer.mjs b/src/BasicOpenlayersRenderer.mjs
index 3ce15b4..6c6e4e6 100644
--- a/src/BasicOpenlayersRenderer.mjs
+++ b/src/BasicOpenlayersRenderer.mjs
@@ -171,14 +171,14 @@ const Renderer = class extends defaultExport {
 
   // Apply vector layer for markers onto map
   addMarker (config) {
-    const position = this.ol.proj.fromLonLat(config.xy, this.crs)
-    const element = document.createElement('div')
-    element.innerHTML = config.type === 'circle' ? this.svgForAnchor.html : this.svgForMarker.html
+    const element = config.element ?? document.createElement('div')
+    if (!element.children) element.innerHTML = this.svgPin
 
+    const position = this.ol.proj.fromLonLat(config.xy, this.crs)
     const overlay = new ol.Overlay({
       element,
       position,
-      positioning: config.type === 'circle' ? 'center-center' : 'bottom-center',
+      positioning: config.type !== 'pin' ? 'center-center' : 'bottom-center',
     })
     this.map.addOverlay(overlay)