diff options
author | Abyss777 <abyss@fox5.ru> | 2016-11-26 14:21:48 +0700 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-11-26 14:21:48 +0700 |
commit | 020a2409a58e73e988a108e314006f45b436b572 (patch) | |
tree | c5b5f5a2734a5689aa1502aa84f6791762efbd74 /web/app/view/MapController.js | |
parent | 70fac91c8a3386fda51b9c889bfbd27c66cf605a (diff) | |
download | trackermap-web-020a2409a58e73e988a108e314006f45b436b572.tar.gz trackermap-web-020a2409a58e73e988a108e314006f45b436b572.tar.bz2 trackermap-web-020a2409a58e73e988a108e314006f45b436b572.zip |
Totally update device marker instead of updating only image src
Diffstat (limited to 'web/app/view/MapController.js')
-rw-r--r-- | web/app/view/MapController.js | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js index 9fcd4939..bea1253b 100644 --- a/web/app/view/MapController.js +++ b/web/app/view/MapController.js @@ -103,9 +103,7 @@ Ext.define('Traccar.view.MapController', { style = marker.getStyle(); if (style.getImage().fill !== this.getDeviceColor(device) || style.getImage().category !== device.get('category')) { - Traccar.DeviceImages.changeImageColor(style.getImage(), - this.getDeviceColor(device), device.get('category')); - marker.changed(); + marker.setStyle(this.updateDeviceMarker(style, this.getDeviceColor(device), device.get('category'))); } if (style.getText().getText() !== device.get('name')) { style.getText().setText(device.get('name')); @@ -339,6 +337,20 @@ Ext.define('Traccar.view.MapController', { }); }, + updateDeviceMarker: function (style, color, category) { + var image, text; + image = Traccar.DeviceImages.getImageIcon(color, + style.getImage().zoom, + style.getImage().angle, + category); + text = style.getText(); + text.setOffsetY(-image.getSize()[1] / 2 - Traccar.Style.mapTextOffset); + return new ol.style.Style({ + image: image, + text: text + }); + }, + selectMarker: function (marker, center) { if (this.selectedMarker) { this.selectedMarker.setStyle( |