Showing
1 changed file
with
4 additions
and
3 deletions
@@ -403,7 +403,7 @@ export default class TbMapWidget { | @@ -403,7 +403,7 @@ export default class TbMapWidget { | ||
403 | if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) { | 403 | if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) { |
404 | location.settings.currentImage = image; | 404 | location.settings.currentImage = image; |
405 | } | 405 | } |
406 | - location.marker = tbMap.map.createMarker(markerLocation, location.settings, | 406 | + location.marker = tbMap.map.createMarker(markerLocation, location.dsIndex, location.settings, |
407 | function() { | 407 | function() { |
408 | tbMap.callbacks.onLocationClick(location); | 408 | tbMap.callbacks.onLocationClick(location); |
409 | } | 409 | } |
@@ -563,8 +563,9 @@ export default class TbMapWidget { | @@ -563,8 +563,9 @@ export default class TbMapWidget { | ||
563 | var tooltips = this.map.getTooltips(); | 563 | var tooltips = this.map.getTooltips(); |
564 | for (var t=0; t < tooltips.length; t++) { | 564 | for (var t=0; t < tooltips.length; t++) { |
565 | var tooltip = tooltips[t]; | 565 | var tooltip = tooltips[t]; |
566 | - var text = tooltip.pattern; | ||
567 | - var replaceInfo = tooltip.replaceInfo; | 566 | + var settings = tooltip.locationSettings; |
567 | + var text = settings.tooltipPattern; | ||
568 | + var replaceInfo = settings.tooltipReplaceInfo; | ||
568 | for (var v = 0; v < replaceInfo.variables.length; v++) { | 569 | for (var v = 0; v < replaceInfo.variables.length; v++) { |
569 | var variableInfo = replaceInfo.variables[v]; | 570 | var variableInfo = replaceInfo.variables[v]; |
570 | var txtVal = ''; | 571 | var txtVal = ''; |