diff options
Diffstat (limited to 'web/app/view/MapController.js')
| -rw-r--r-- | web/app/view/MapController.js | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js index c29c4900..13d3c8bd 100644 --- a/web/app/view/MapController.js +++ b/web/app/view/MapController.js @@ -86,17 +86,6 @@ Ext.define('Traccar.view.MapController', { } }, - changeMarkerColor: function (style, color, category) { - var newStyle = new ol.style.Style({ - image: Traccar.DeviceImages.getImageIcon(color, - style.getImage().zoom, - style.getImage().angle, - category), - text: style.getText() - }); - return newStyle; - }, - updateDevice: function (store, data) { var i, device, deviceId, marker, style; @@ -113,8 +102,9 @@ Ext.define('Traccar.view.MapController', { style = marker.getStyle(); if (style.getImage().fill !== this.getDeviceColor(device) || style.getImage().category !== device.get('category')) { - marker.setStyle( - this.changeMarkerColor(style, this.getDeviceColor(device), device.get('category'))); + Traccar.DeviceImages.changeImageColor(style.getImage(), + this.getDeviceColor(device), device.get('category')); + marker.changed(); } } } @@ -157,7 +147,7 @@ Ext.define('Traccar.view.MapController', { marker = this.latestMarkers[deviceId]; style = marker.getStyle(); if (style.getImage().angle !== position.get('course')) { - marker.setStyle(this.rotateMarker(marker.getStyle(), position.get('course'))); + Traccar.DeviceImages.rotateImageIcon(style.getImage(), position.get('course')); } marker.setGeometry(geometry); } else { @@ -329,17 +319,6 @@ Ext.define('Traccar.view.MapController', { }); }, - rotateMarker: function (style, angle) { - var newStyle = new ol.style.Style({ - image: Traccar.DeviceImages.getImageIcon(style.getImage().fill, - style.getImage().zoom, - angle, - style.getImage().category), - text: style.getText() - }); - return newStyle; - }, - selectMarker: function (marker, center) { if (this.selectedMarker) { this.selectedMarker.setStyle( |