Merge pull request #371 from Abyss777/charts

Charts implementation

1 files changed, 2 insertions, 18 deletions

diff --git a/web/app/view/MapMarkerController.js b/web/app/view/MapMarkerController.js
index 510e11bd..f8f0e43f 100644
--- a/web/app/view/MapMarkerController.js
+++ b/web/app/view/MapMarkerController.js
@@ -276,26 +276,10 @@ Ext.define('Traccar.view.MapMarkerController', {
         }
     },
 
-    getReportColor: function (deviceId) {
-        var index, reportColor, device = Ext.getStore('Devices').getById(deviceId);
-        if (device) {
-            reportColor = device.get('attributes')['web.reportColor'];
-        }
-        if (reportColor) {
-            return reportColor;
-        } else {
-            index = 0;
-            if (deviceId !== undefined) {
-                index = deviceId % Traccar.Style.mapRouteColor.length;
-            }
-            return Traccar.Style.mapRouteColor[index];
-        }
-    },
-
     getRouteStyle: function (deviceId) {
         return new ol.style.Style({
             stroke: new ol.style.Stroke({
-                color: this.getReportColor(deviceId),
+                color: Traccar.app.getReportColor(deviceId),
                 width: Traccar.Style.mapRouteWidth
             })
         });
@@ -325,7 +309,7 @@ Ext.define('Traccar.view.MapMarkerController', {
     },
 
     getReportMarker: function (deviceId, angle) {
-        return this.getMarkerStyle(false, this.getReportColor(deviceId), angle, 'arrow');
+        return this.getMarkerStyle(false, Traccar.app.getReportColor(deviceId), angle, 'arrow');
     },
 
     resizeMarker: function (style, zoom) {