diff options
author | Rafael Guterres <guterresrafael@gmail.com> | 2016-12-21 22:30:52 -0200 |
---|---|---|
committer | Rafael Guterres <guterresrafael@gmail.com> | 2016-12-21 22:30:52 -0200 |
commit | a23b0c9a452f8a06bc781be5c891932096fe5e65 (patch) | |
tree | f92644c27670e0c7f2f210905ee4b0e21916425c /web/app/view/MapMarkerController.js | |
parent | eb5089cffdf6a3ed5e29fcce1b525b223ce5fe05 (diff) | |
parent | 19d6e1c9cc916ed4c1ed72fe168909770a657db2 (diff) | |
download | etbsa-traccar-web-a23b0c9a452f8a06bc781be5c891932096fe5e65.tar.gz etbsa-traccar-web-a23b0c9a452f8a06bc781be5c891932096fe5e65.tar.bz2 etbsa-traccar-web-a23b0c9a452f8a06bc781be5c891932096fe5e65.zip |
Merge branch 'master' of https://github.com/tananaev/traccar-web
Diffstat (limited to 'web/app/view/MapMarkerController.js')
-rw-r--r-- | web/app/view/MapMarkerController.js | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/web/app/view/MapMarkerController.js b/web/app/view/MapMarkerController.js index 5fa9f4c..b978aaf 100644 --- a/web/app/view/MapMarkerController.js +++ b/web/app/view/MapMarkerController.js @@ -92,7 +92,8 @@ Ext.define('Traccar.view.MapMarkerController', { style = marker.getStyle(); if (style.getImage().fill !== this.getDeviceColor(device) || style.getImage().category !== device.get('category')) { - marker.setStyle(this.updateDeviceMarker(style, this.getDeviceColor(device), device.get('category'))); + this.updateDeviceMarker(style, this.getDeviceColor(device), device.get('category')); + marker.changed(); } if (style.getText().getText() !== device.get('name')) { style.getText().setText(device.get('name')); @@ -144,7 +145,7 @@ Ext.define('Traccar.view.MapMarkerController', { marker = this.latestMarkers[deviceId]; style = marker.getStyle(); if (style.getImage().angle !== position.get('course')) { - Traccar.DeviceImages.rotateImageIcon(style.getImage(), position.get('course')); + this.rotateMarker(style, position.get('course')); } marker.setGeometry(geometry); } else { @@ -327,10 +328,15 @@ Ext.define('Traccar.view.MapMarkerController', { style.getImage().category); text = style.getText(); text.setOffsetY(-image.getSize()[1] / 2 - Traccar.Style.mapTextOffset); - return new ol.style.Style({ - image: image, - text: text - }); + style.setText(text); + style.setImage(image); + }, + + rotateMarker: function (style, angle) { + style.setImage(Traccar.DeviceImages.getImageIcon(style.getImage().fill, + style.getImage().zoom, + angle, + style.getImage().category)); }, updateDeviceMarker: function (style, color, category) { @@ -341,21 +347,19 @@ Ext.define('Traccar.view.MapMarkerController', { category); text = style.getText(); text.setOffsetY(-image.getSize()[1] / 2 - Traccar.Style.mapTextOffset); - return new ol.style.Style({ - image: image, - text: text - }); + style.setText(text); + style.setImage(image); }, selectMarker: function (marker, center) { if (this.selectedMarker) { - this.selectedMarker.setStyle( - this.resizeMarker(this.selectedMarker.getStyle(), false)); + this.resizeMarker(this.selectedMarker.getStyle(), false); + this.selectedMarker.changed(); } if (marker) { - marker.setStyle( - this.resizeMarker(marker.getStyle(), true)); + this.resizeMarker(marker.getStyle(), true); + marker.changed(); if (center) { this.getView().getMapView().setCenter(marker.getGeometry().getCoordinates()); } |