From f6a5312134bd3df232f92d8ff8e6a612e3f73c0b Mon Sep 17 00:00:00 2001
From: Patryk <patryk@init.biz>
Date: Wed, 29 Apr 2020 12:49:49 +0200
Subject: [PATCH 1/3] last fix for deafult icon and add media finder in
 settings

---
 components/partials/markers.htm | 8 +++++++-
 models/settings/fields.yaml     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/components/partials/markers.htm b/components/partials/markers.htm
index ee29c8f..87d745a 100644
--- a/components/partials/markers.htm
+++ b/components/partials/markers.htm
@@ -15,8 +15,14 @@
     #}
     {% else %}
         <script>
-            L.Icon.Default.prototype.options.iconUrl = '{{ __SELF__.getMarkerIconUrl()|app }}';
+            {% if __SELF__.getMarkerIconUrl() %}
+                let DefaultIcon = L.icon({
+                    iconUrl: '{{ __SELF__.getMarkerIconUrl()|media }}',
+                    iconSize: [40,40],
+                });
+            {% endif %}
 
+            L.Marker.prototype.options.icon = DefaultIcon;
             {% for marker in __SELF__.markers %}
                   L.marker([{{ marker.lat }}, {{ marker.lon }}])
                    .addTo({{ mapVar }})
diff --git a/models/settings/fields.yaml b/models/settings/fields.yaml
index 6526cfb..a7e9993 100644
--- a/models/settings/fields.yaml
+++ b/models/settings/fields.yaml
@@ -7,7 +7,7 @@ tabs:
         marker_icon_url:
             label: initbiz.leafletpro::lang.settings.marker_icon_url
             tab: initbiz.leafletpro::lang.settings.general_tab
-            type: text
+            type: mediafinder
             span: left
             default: '/plugins/initbiz/leafletpro/assets/node_modules/leaflet/dist/images/marker-icon.png'
         nominatim_url:

From 4c7af0cc48e65f1192d25ce13bd4a2b0e19bd22b Mon Sep 17 00:00:00 2001
From: Patryk <patryk@init.biz>
Date: Wed, 29 Apr 2020 13:31:11 +0200
Subject: [PATCH 2/3] add new translate

---
 lang/en/lang.php            | 2 +-
 models/settings/fields.yaml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lang/en/lang.php b/lang/en/lang.php
index 3c1aa9c..c801e02 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -70,7 +70,7 @@
         'label' => 'LeafletPro',
         'description' => 'LeafletPro general settings',
         'general_tab' => 'General',
-        'marker_icon_url' => 'Full URL of the default marker icon',
+        'marker_icon_url' => 'Select the icon from the mediafinder',
         'resolvers_tab' => 'Resolvers',
         'nominatim_url' => 'URL of Nominatim service',
         'nominatim_url_comment' => 'Read more info about Nominatim service <a href="https://operations.osmfoundation.org/policies/nominatim/" target="_blank">here</a>',
diff --git a/models/settings/fields.yaml b/models/settings/fields.yaml
index a7e9993..2d744ba 100644
--- a/models/settings/fields.yaml
+++ b/models/settings/fields.yaml
@@ -9,7 +9,6 @@ tabs:
             tab: initbiz.leafletpro::lang.settings.general_tab
             type: mediafinder
             span: left
-            default: '/plugins/initbiz/leafletpro/assets/node_modules/leaflet/dist/images/marker-icon.png'
         nominatim_url:
             label: initbiz.leafletpro::lang.settings.nominatim_url
             commentAbove: initbiz.leafletpro::lang.settings.nominatim_url_comment

From 1a372d06111e3a27affe33350eb318247d3b8034 Mon Sep 17 00:00:00 2001
From: Patryk <patryk@init.biz>
Date: Wed, 29 Apr 2020 14:34:32 +0200
Subject: [PATCH 3/3] fix twig if

---
 components/partials/markers.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/partials/markers.htm b/components/partials/markers.htm
index 87d745a..f2fbc34 100644
--- a/components/partials/markers.htm
+++ b/components/partials/markers.htm
@@ -20,9 +20,9 @@
                     iconUrl: '{{ __SELF__.getMarkerIconUrl()|media }}',
                     iconSize: [40,40],
                 });
+                L.Marker.prototype.options.icon = DefaultIcon;
             {% endif %}
 
-            L.Marker.prototype.options.icon = DefaultIcon;
             {% for marker in __SELF__.markers %}
                   L.marker([{{ marker.lat }}, {{ marker.lon }}])
                    .addTo({{ mapVar }})