From 3cb5cca4b8db07fa477b23c711916307ff7db427 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 25 Aug 2016 16:18:12 +0500
Subject: - Enabled multiple devices for reports

- Used different colors for routes of different devices
---
 web/app/Style.js | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'web/app/Style.js')

diff --git a/web/app/Style.js b/web/app/Style.js
index ec007e674..8d1cf3c0e 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -38,7 +38,14 @@ Ext.define('Traccar.Style', {
     mapDefaultLon: -0.1275,
     mapDefaultZoom: 6,
 
-    mapRouteColor: 'rgba(21, 127, 204, 1.0)',
+    mapRouteColor: [
+        'rgba(21, 127, 204, 1.0)',
+        'rgba(109, 46, 204, 1.0)',
+        'rgba(204, 46, 162, 1.0)',
+        'rgba(204, 46, 38, 1.0)',
+        'rgba(128, 204, 46, 1.0)',
+        'rgba(46, 204, 155, 1.0)'
+    ],
     mapRouteWidth: 5,
 
     mapArrowStrokeColor: 'rgba(50, 50, 50, 1.0)',
@@ -53,7 +60,14 @@ Ext.define('Traccar.Style', {
     mapColorOnline: 'rgba(77, 250, 144, 1.0)',
     mapColorUnknown: 'rgba(250, 190, 77, 1.0)',
     mapColorOffline: 'rgba(255, 84, 104, 1.0)',
-    mapColorReport: 'rgba(21, 127, 204, 1.0)',
+    mapColorReport: [
+        'rgba(21, 127, 204, 1.0)',
+        'rgba(109, 46, 204, 1.0)',
+        'rgba(204, 46, 162, 1.0)',
+        'rgba(204, 46, 38, 1.0)',
+        'rgba(128, 204, 46, 1.0)',
+        'rgba(46, 204, 155, 1.0)'
+    ],
     mapColorOverlay: 'rgba(21, 127, 204, 0.2)',
 
     mapRadiusNormal: 9,
-- 
cgit v1.2.3


From 557c4214ae6ea8663f3f85cfa5652411aaa1ea09 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 25 Aug 2016 17:32:52 +0500
Subject: Removed array duplication

---
 web/app/Style.js              | 8 --------
 web/app/view/MapController.js | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'web/app/Style.js')

diff --git a/web/app/Style.js b/web/app/Style.js
index 8d1cf3c0e..2d6bfa5c3 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -60,14 +60,6 @@ Ext.define('Traccar.Style', {
     mapColorOnline: 'rgba(77, 250, 144, 1.0)',
     mapColorUnknown: 'rgba(250, 190, 77, 1.0)',
     mapColorOffline: 'rgba(255, 84, 104, 1.0)',
-    mapColorReport: [
-        'rgba(21, 127, 204, 1.0)',
-        'rgba(109, 46, 204, 1.0)',
-        'rgba(204, 46, 162, 1.0)',
-        'rgba(204, 46, 38, 1.0)',
-        'rgba(128, 204, 46, 1.0)',
-        'rgba(46, 204, 155, 1.0)'
-    ],
     mapColorOverlay: 'rgba(21, 127, 204, 0.2)',
 
     mapRadiusNormal: 9,
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js
index 57278ce07..bc6a5d404 100644
--- a/web/app/view/MapController.js
+++ b/web/app/view/MapController.js
@@ -255,7 +255,7 @@ Ext.define('Traccar.view.MapController', {
             index = deviceId % Traccar.Style.mapRouteColor.length;
         }
         return this.getMarkerStyle(
-            Traccar.Style.mapRadiusNormal, Traccar.Style.mapColorReport[index]);
+            Traccar.Style.mapRadiusNormal, Traccar.Style.mapRouteColor[index]);
     },
 
     resizeMarker: function (style, radius) {
-- 
cgit v1.2.3