dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deprecated maps settings.

Browse Source
This commit is contained in:
Igor Kulikov 2018-11-27 13:27:51 +02:00
parent 693b58478b
commit 5f2bfd93de
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/src/app/widget/lib/map-widget.js
View File

@ -403,7 +403,7 @@ export default class TbMapWidget {
if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) { if (image && (!location.settings.currentImage || !angular.equals(location.settings.currentImage, image))) {
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() { function() {
tbMap.callbacks.onLocationClick(location); tbMap.callbacks.onLocationClick(location);
} }
@ -563,8 +563,9 @@ export default class TbMapWidget {
var tooltips = this.map.getTooltips(); var tooltips = this.map.getTooltips();
for (var t=0; t < tooltips.length; t++) { for (var t=0; t < tooltips.length; t++) {
var tooltip = tooltips[t]; var tooltip = tooltips[t];
var text = tooltip.pattern; var settings = tooltip.locationSettings;
var replaceInfo = tooltip.replaceInfo; var text = settings.tooltipPattern;
var replaceInfo = settings.tooltipReplaceInfo;
for (var v = 0; v < replaceInfo.variables.length; v++) { for (var v = 0; v < replaceInfo.variables.length; v++) {
var variableInfo = replaceInfo.variables[v]; var variableInfo = replaceInfo.variables[v];
var txtVal = ''; var txtVal = '';