Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/Map/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -416,9 +416,9 @@ async function applyPreselectedMarkersVisualOnly(map, markersData) {
for (const markerData of preselected) {
const markerInstance = markerMap.get(markerData.id);
if (markerInstance && markerInstance._selectedIcon) {
if (settings && settings.color) {
if ((settings && settings.color) || markerData.iconStyle) {
const iconUrl = markerInstance._selectedIcon.options.iconUrl;
const newIcon = await createMarkerIcon(map, iconUrl, null);
const newIcon = await createMarkerIcon(map, iconUrl, null, null, markerData.iconStyle);
markerInstance.setIcon(newIcon);
} else {
markerInstance.setIcon(markerInstance._selectedIcon);
Expand Down Expand Up @@ -547,7 +547,7 @@ async function selectMarker(marker, map, showSelectionOrder) {
}

if (showSelectionOrder) {
const newIcon = await createMarkerIcon(map, marker.options.icon.options.iconUrl, newOrder);
const newIcon = await createMarkerIcon(map, marker.options.icon.options.iconUrl, newOrder, null, marker._markerData?.iconStyle);
marker.setIcon(newIcon);
}
}
Expand Down Expand Up @@ -586,16 +586,19 @@ function deselectMarker(marker, map, showSelectionOrder) {
async function updateMarkerOrderDisplay(map, marker, orderNumber, isSelected, color = null) {
if (!marker._normalIcon || !marker._normalIcon.options) return;
const iconUrl = isSelected && marker._selectedIcon ? marker._selectedIcon.options.iconUrl : marker._normalIcon.options.iconUrl;
const newIcon = await createMarkerIcon(map, iconUrl, orderNumber, color);
const newIcon = await createMarkerIcon(map, iconUrl, orderNumber, color, marker._markerData?.iconStyle);
marker.setIcon(newIcon);
}

async function createMarkerIcon(map, iconUrl, orderNumber, color = null) {
let inlineStyle = null;
async function createMarkerIcon(map, iconUrl, orderNumber, color = null, iconStyle = null) {
let inlineStyle = '';
const settings = routeSettingsMap.get(map);
if ((settings && settings.color) || color) {
inlineStyle = `--marker-fill: ${color ?? settings.color};`;
}
if (iconStyle) {
inlineStyle += iconStyle;
}

let svg;
if (svgCache.has(iconUrl)) {
Expand Down