aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-12-05 21:42:54 +1300
committerGitHub <noreply@github.com>2017-12-05 21:42:54 +1300
commite4228a57423683e3180cf78ae1fd286430dcfb76 (patch)
tree4e8a548a23e118222a7a838ad172f88235feb52c
parentc8c598791f7efdbbb0277d04ace48504b083dd30 (diff)
parent5c07a434e8f2113252a5ac21a6e35fa0df71f407 (diff)
downloadetbsa-traccar-web-e4228a57423683e3180cf78ae1fd286430dcfb76.tar.gz
etbsa-traccar-web-e4228a57423683e3180cf78ae1fd286430dcfb76.tar.bz2
etbsa-traccar-web-e4228a57423683e3180cf78ae1fd286430dcfb76.zip
Merge pull request #625 from Abyss777/simplify_attribuions
Simplify map attributions
-rw-r--r--web/app/view/map/BaseMap.js34
1 files changed, 6 insertions, 28 deletions
diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js
index 32fb17d..c36e71a 100644
--- a/web/app/view/map/BaseMap.js
+++ b/web/app/view/map/BaseMap.js
@@ -42,11 +42,7 @@ Ext.define('Traccar.view.map.BaseMap', {
layer = new ol.layer.Tile({
source: new ol.source.XYZ({
url: server.get('mapUrl'),
- attributions: [
- new ol.Attribution({
- html: ''
- })
- ]
+ attributions: ''
})
});
break;
@@ -78,14 +74,8 @@ Ext.define('Traccar.view.map.BaseMap', {
layer = new ol.layer.Tile({
source: new ol.source.XYZ({
url: 'https://cartodb-basemaps-{a-d}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png',
- attributions: [
- new ol.Attribution({
- html: [
- '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> ' +
- 'contributors, &copy; <a href="https://carto.com/attributions">CARTO</a>'
- ]
- })
- ]
+ attributions: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> ' +
+ 'contributors, &copy; <a href="https://carto.com/attributions">CARTO</a>'
})
});
break;
@@ -118,11 +108,7 @@ Ext.define('Traccar.view.map.BaseMap', {
1024, 512, 256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5
]
}),
- attributions: [
- new ol.Attribution({
- html: '&copy; <a href="http://map.baidu.com/">Baidu</a>'
- })
- ]
+ attributions: '&copy; <a href="http://map.baidu.com/">Baidu</a>'
})
});
break;
@@ -131,11 +117,7 @@ Ext.define('Traccar.view.map.BaseMap', {
source: new ol.source.XYZ({
url: 'https://vec0{1-4}.maps.yandex.net/tiles?l=map&x={x}&y={y}&z={z}',
projection: 'EPSG:3395',
- attributions: [
- new ol.Attribution({
- html: '&copy; <a href="https://yandex.com/maps/">Yandex</a>'
- })
- ]
+ attributions: '&copy; <a href="https://yandex.com/maps/">Yandex</a>'
})
});
break;
@@ -144,11 +126,7 @@ Ext.define('Traccar.view.map.BaseMap', {
source: new ol.source.XYZ({
url: 'https://sat0{1-4}.maps.yandex.net/tiles?l=sat&x={x}&y={y}&z={z}',
projection: 'EPSG:3395',
- attributions: [
- new ol.Attribution({
- html: '&copy; <a href="https://yandex.com/maps/">Yandex</a>'
- })
- ]
+ attributions: '&copy; <a href="https://yandex.com/maps/">Yandex</a>'
})
});
break;