aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-09-01 00:19:47 +1200
committerGitHub <noreply@github.com>2016-09-01 00:19:47 +1200
commit0a63cdc62c4499076f9c151cdbd5db783e87fea5 (patch)
tree55a97542fa2c5b2172e0ed5fdab1cb0e831d7098
parentf8d0544edb04745afdd481eaf6424d8601784472 (diff)
parente2c2a8151fddf9dae56400e58086b3014b7cb6b2 (diff)
downloadtraccar-server-0a63cdc62c4499076f9c151cdbd5db783e87fea5.tar.gz
traccar-server-0a63cdc62c4499076f9c151cdbd5db783e87fea5.tar.bz2
traccar-server-0a63cdc62c4499076f9c151cdbd5db783e87fea5.zip
Merge pull request #2273 from Abyss777/fix_geofences
Fix geofences colors and separate geofences styles
-rw-r--r--web/app/Style.js6
-rw-r--r--web/app/view/GeofenceMap.js10
2 files changed, 10 insertions, 6 deletions
diff --git a/web/app/Style.js b/web/app/Style.js
index d047fd96b..349f3d7eb 100644
--- a/web/app/Style.js
+++ b/web/app/Style.js
@@ -60,7 +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)',
- mapColorOverlay: 'rgba(21, 127, 204, 0.2)',
mapRadiusNormal: 9,
mapRadiusSelected: 14,
@@ -68,6 +67,11 @@ Ext.define('Traccar.Style', {
mapMaxZoom: 19,
mapDelay: 500,
+ mapGeofenceColor: 'rgba(21, 127, 204, 1.0)',
+ mapGeofenceOverlay: 'rgba(21, 127, 204, 0.2)',
+ mapGeofenceWidth: 5,
+ mapGeofenceRadius: 9,
+
coordinatePrecision: 6,
numberPrecision: 2,
diff --git a/web/app/view/GeofenceMap.js b/web/app/view/GeofenceMap.js
index 573836bc9..933df2369 100644
--- a/web/app/view/GeofenceMap.js
+++ b/web/app/view/GeofenceMap.js
@@ -72,16 +72,16 @@ Ext.define('Traccar.view.GeofenceMap', {
}),
style: new ol.style.Style({
fill: new ol.style.Fill({
- color: Traccar.Style.mapColorOverlay
+ color: Traccar.Style.mapGeofenceOverlay
}),
stroke: new ol.style.Stroke({
- color: Traccar.Style.mapColorReport,
- width: Traccar.Style.mapRouteWidth
+ color: Traccar.Style.mapGeofenceColor,
+ width: Traccar.Style.mapGeofenceWidth
}),
image: new ol.style.Circle({
- radius: Traccar.Style.mapRadiusNormal,
+ radius: Traccar.Style.mapGeofenceRadius,
fill: new ol.style.Fill({
- color: Traccar.Style.mapColorReport
+ color: Traccar.Style.mapGeofenceColor
})
})
})