aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-12-07 22:01:19 +1300
committerGitHub <noreply@github.com>2017-12-07 22:01:19 +1300
commita309c492b5af0e946b7b0135b6649ca85d781c95 (patch)
tree3c60bc92bb5a7e3ec78f2e5e28936afcfb29f09e /web
parente4228a57423683e3180cf78ae1fd286430dcfb76 (diff)
parenta561ea4e1f31c9766f756102a41de8a8f480dc1f (diff)
downloadetbsa-traccar-web-a309c492b5af0e946b7b0135b6649ca85d781c95.tar.gz
etbsa-traccar-web-a309c492b5af0e946b7b0135b6649ca85d781c95.tar.bz2
etbsa-traccar-web-a309c492b5af0e946b7b0135b6649ca85d781c95.zip
Merge pull request #626 from Abyss777/ol_4.6.1
Update openlayers to 4.6.1
Diffstat (limited to 'web')
-rw-r--r--web/app/view/map/MapMarkerController.js2
-rw-r--r--web/load.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js
index 5443d53..bf6b0d4 100644
--- a/web/app/view/map/MapMarkerController.js
+++ b/web/app/view/map/MapMarkerController.js
@@ -104,7 +104,7 @@ Ext.define('Traccar.view.map.MapMarkerController', {
if (label) {
styleConfig.text = new ol.style.Text({
text: label,
- exceedLength: true,
+ overflow: true,
fill: new ol.style.Fill({
color: Traccar.Style.mapGeofenceTextColor
}),
diff --git a/web/load.js b/web/load.js
index 28227c2..a5e67fc 100644
--- a/web/load.js
+++ b/web/load.js
@@ -145,7 +145,7 @@
extjsVersion = '6.2.0';
fontAwesomeVersion = '4.7.0';
- olVersion = '4.5.0';
+ olVersion = '4.6.1';
proj4jsVersion = '2.4.3';
if (debugMode) {