diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-12-05 20:32:13 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 20:32:13 +1300 |
| commit | c8c598791f7efdbbb0277d04ace48504b083dd30 (patch) | |
| tree | 861962a702bcc19e3ce749d12e20f835ca1ebbb6 /web | |
| parent | 3a148c2a901cbef2e46c888529ac01df57a9ba9f (diff) | |
| parent | 5a9ac7787c746bde0fb466b2ff5f8654174c6f77 (diff) | |
| download | etbsa-traccar-web-c8c598791f7efdbbb0277d04ace48504b083dd30.tar.gz etbsa-traccar-web-c8c598791f7efdbbb0277d04ace48504b083dd30.tar.bz2 etbsa-traccar-web-c8c598791f7efdbbb0277d04ace48504b083dd30.zip | |
Merge pull request #624 from Abyss777/ol_4.5
Update openlayers version to 4.5.0
Diffstat (limited to 'web')
| -rw-r--r-- | web/app/view/map/MapMarkerController.js | 1 | ||||
| -rw-r--r-- | web/load.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/web/app/view/map/MapMarkerController.js b/web/app/view/map/MapMarkerController.js index c46faac..5443d53 100644 --- a/web/app/view/map/MapMarkerController.js +++ b/web/app/view/map/MapMarkerController.js @@ -104,6 +104,7 @@ Ext.define('Traccar.view.map.MapMarkerController', { if (label) { styleConfig.text = new ol.style.Text({ text: label, + exceedLength: true, fill: new ol.style.Fill({ color: Traccar.Style.mapGeofenceTextColor }), diff --git a/web/load.js b/web/load.js index cb5defd..28227c2 100644 --- a/web/load.js +++ b/web/load.js @@ -145,7 +145,7 @@ extjsVersion = '6.2.0'; fontAwesomeVersion = '4.7.0'; - olVersion = '4.3.2'; + olVersion = '4.5.0'; proj4jsVersion = '2.4.3'; if (debugMode) { |