Merge pull request #5 from initbiz/fix-default-icon

Fix default icon
initbiz · Apr 29, 2020 · 205de6f · 205de6f
2 parents 91edc60 + 1a372d0
commit 205de6f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/components/partials/markers.htm b/components/partials/markers.htm
@@ -15,7 +15,13 @@
     #}
     {% 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],
+                });
+                L.Marker.prototype.options.icon = DefaultIcon;
+            {% endif %}
 
             {% for marker in __SELF__.markers %}
                   L.marker([{{ marker.lat }}, {{ marker.lon }}])

diff --git 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
@@ -7,9 +7,8 @@ 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:
             label: initbiz.leafletpro::lang.settings.nominatim_url
             commentAbove: initbiz.leafletpro::lang.settings.nominatim_url_comment