From 5f2bfd93de79d8b98de09dda7c1712fb42706a20 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 27 Nov 2018 13:27:51 +0200 Subject: [PATCH] Fix deprecated maps settings. --- ui/src/app/widget/lib/map-widget.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/src/app/widget/lib/map-widget.js b/ui/src/app/widget/lib/map-widget.js index 0191034788..ca038c2a29 100644 --- a/ui/src/app/widget/lib/map-widget.js +++ b/ui/src/app/widget/lib/map-widget.js @@ -403,7 +403,7 @@ export default class TbMapWidget { if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) { location.settings.currentImage = image; } - location.marker = tbMap.map.createMarker(markerLocation, location.settings, + location.marker = tbMap.map.createMarker(markerLocation, location.dsIndex, location.settings, function() { tbMap.callbacks.onLocationClick(location); } @@ -563,8 +563,9 @@ export default class TbMapWidget { var tooltips = this.map.getTooltips(); for (var t=0; t < tooltips.length; t++) { var tooltip = tooltips[t]; - var text = tooltip.pattern; - var replaceInfo = tooltip.replaceInfo; + var settings = tooltip.locationSettings; + var text = settings.tooltipPattern; + var replaceInfo = settings.tooltipReplaceInfo; for (var v = 0; v < replaceInfo.variables.length; v++) { var variableInfo = replaceInfo.variables[v]; var txtVal = '';