aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/MapMarkerController.js
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2016-12-26 18:06:48 +0500
committerAbyss777 <abyss@fox5.ru>2016-12-26 18:06:48 +0500
commit557ffa7f106e44a09a99746dcd8e4f369ea4730d (patch)
treebd58f402c90d0f930d6cb13867c8be4738ebdd69 /web/app/view/MapMarkerController.js
parent082f7926b846f876613f27f21779b594e79ea0c7 (diff)
downloadtrackermap-web-557ffa7f106e44a09a99746dcd8e4f369ea4730d.tar.gz
trackermap-web-557ffa7f106e44a09a99746dcd8e4f369ea4730d.tar.bz2
trackermap-web-557ffa7f106e44a09a99746dcd8e4f369ea4730d.zip
Charts implementation
Diffstat (limited to 'web/app/view/MapMarkerController.js')
-rw-r--r--web/app/view/MapMarkerController.js20
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) {