From 6fbced79bf2c1c895d9932021661e0105ecb333e Mon Sep 17 00:00:00 2001 From: Nicolas F Date: Wed, 9 May 2018 15:45:31 +0200 Subject: [PATCH] Fix custom icons not showing up properly Individual POIs such as player POIs can have their own icon per POI, so we should respect that. --- overviewer_core/data/js_src/util.js | 12 +++++++++--- overviewer_core/data/web_assets/overviewer.css | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/overviewer_core/data/js_src/util.js b/overviewer_core/data/js_src/util.js index b1c113a..ef4116d 100644 --- a/overviewer_core/data/js_src/util.js +++ b/overviewer_core/data/js_src/util.js @@ -293,14 +293,20 @@ overviewer.util = { var marker_group = new L.layerGroup(); var marker_entry = markers[obj.path][mkidx]; var icon = L.icon({iconUrl: marker_entry.icon, - iconSize: [32, 32]}); + className: "custom-icon"}); console.log("marker group:", marker_entry.displayName, marker_entry.groupName); for (var dbidx = 0; dbidx < markersDB[marker_entry.groupName].raw.length; dbidx++) { var db = markersDB[marker_entry.groupName].raw[dbidx]; var latlng = overviewer.util.fromWorldToLatLng(db.x, db.y, db.z, obj); - console.log(latlng); - let new_marker = new L.marker(latlng, {icon: icon}); + var m_icon; + if (db.icon != undefined) { + m_icon = L.icon({iconUrl: db.icon, + className: "custom-icon"}); + } else { + m_icon = icon; + } + let new_marker = new L.marker(latlng, {icon: m_icon}); new_marker.bindPopup(db.text); marker_group.addLayer(new_marker); } diff --git a/overviewer_core/data/web_assets/overviewer.css b/overviewer_core/data/web_assets/overviewer.css index 4d3f94a..a7b91be 100644 --- a/overviewer_core/data/web_assets/overviewer.css +++ b/overviewer_core/data/web_assets/overviewer.css @@ -173,3 +173,9 @@ div.worldcontrol select { padding: 0 5px; color: #333; } + +.custom-icon { + position:relative; + left:-50%; + top:-50%; +}