From 9e805ea8da36fb118911542af09b9a746e45058f Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yohanboniface@free.fr>
Date: Wed, 14 Feb 2024 18:37:26 +0100
Subject: [PATCH] fix: make default picto always white for now

fix #1594
---
 umap/static/umap/img/marker.svg   | 10 ++++++----
 umap/static/umap/js/umap.forms.js |  2 +-
 umap/static/umap/js/umap.icon.js  |  2 +-
 umap/static/umap/js/umap.js       |  1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/umap/static/umap/img/marker.svg b/umap/static/umap/img/marker.svg
index 9b579a76..eefae220 100644
--- a/umap/static/umap/img/marker.svg
+++ b/umap/static/umap/img/marker.svg
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" id="circle" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
-  <path d="M14,7.5c0,3.5899-2.9101,6.5-6.5,6.5S1,11.0899,1,7.5S3.9101,1,7.5,1S14,3.9101,14,7.5z"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" id="circle" width="15" height="15" viewBox="0 0 15 15" sodipodi:docname="marker.svg" inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs1" />
+  <sodipodi:namedview id="namedview1" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:showpageshadow="2" inkscape:pageopacity="0.0" inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:zoom="53.666667" inkscape:cx="7.4906832" inkscape:cy="7.5" inkscape:window-width="1920" inkscape:window-height="1011" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:current-layer="circle" />
+  <path d="M14,7.5c0,3.5899-2.9101,6.5-6.5,6.5S1,11.0899,1,7.5S3.9101,1,7.5,1S14,3.9101,14,7.5z" id="path1" style="fill:#ffffff" />
+</svg>
diff --git a/umap/static/umap/js/umap.forms.js b/umap/static/umap/js/umap.forms.js
index 380c8e9a..4ee82042 100644
--- a/umap/static/umap/js/umap.forms.js
+++ b/umap/static/umap/js/umap.forms.js
@@ -682,7 +682,7 @@ L.FormBuilder.IconUrl = L.FormBuilder.BlurInput.extend({
   },
 
   isDefault: function () {
-    return !this.value() || this.value() === this.obj.getMap().options.default_iconUrl
+    return !this.value() || this.value() === U.DEFAULT_ICON_URL
   },
 
   showSymbolsTab: async function () {
diff --git a/umap/static/umap/js/umap.icon.js b/umap/static/umap/js/umap.icon.js
index 6393fa8a..a771108e 100644
--- a/umap/static/umap/js/umap.icon.js
+++ b/umap/static/umap/js/umap.icon.js
@@ -222,7 +222,7 @@ U.Icon.setIconContrast = function (icon, parent, src, bgcolor) {
   if (L.DomUtil.contrastedColor(parent, bgcolor)) {
     // Decide whether to switch svg to white or not, but do it
     // only for internal SVG, as invert could do weird things
-    if (L.Util.isPath(src) && src.endsWith('.svg')) {
+    if (L.Util.isPath(src) && src.endsWith('.svg') && src !== U.DEFAULT_ICON_URL) {
       // Must be called after icon container is added to the DOM
       // An image
       icon.style.filter = 'invert(1)'
diff --git a/umap/static/umap/js/umap.js b/umap/static/umap/js/umap.js
index dacfb9eb..4d2b3707 100644
--- a/umap/static/umap/js/umap.js
+++ b/umap/static/umap/js/umap.js
@@ -139,6 +139,7 @@ U.Map = L.Map.extend({
     this.setOptionsFromQueryString(geojson.properties)
 
     L.Map.prototype.initialize.call(this, el, geojson.properties)
+    U.DEFAULT_ICON_URL = this.options.default_iconUrl
 
     // After calling parent initialize, as we are doing initCenter our-selves
     if (geojson.geometry) this.options.center = this.latLng(geojson.geometry)