diff options
| author | Iván Ávalos <avalos@disroot.org> | 2021-09-18 15:57:34 -0500 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2021-09-18 15:57:34 -0500 |
| commit | f39286e467cab47548de83c03e0f7c3c84fd2a5c (patch) | |
| tree | e8a9d60366878a7c6413e17b89d1a4100c04e3a2 /web | |
| parent | e3ce12fedfbc37d44b5a47fa523d18f3c6bc0e47 (diff) | |
| download | etbsa-traccar-web-f39286e467cab47548de83c03e0f7c3c84fd2a5c.tar.gz etbsa-traccar-web-f39286e467cab47548de83c03e0f7c3c84fd2a5c.tar.bz2 etbsa-traccar-web-f39286e467cab47548de83c03e0f7c3c84fd2a5c.zip | |
Rearranged maps. Two Google Maps layers are now hardcoded
Diffstat (limited to 'web')
| -rw-r--r-- | web/app/store/MapTypes.js | 7 | ||||
| -rw-r--r-- | web/app/view/map/BaseMap.js | 27 |
2 files changed, 23 insertions, 11 deletions
diff --git a/web/app/store/MapTypes.js b/web/app/store/MapTypes.js index fef19e5..f91f366 100644 --- a/web/app/store/MapTypes.js +++ b/web/app/store/MapTypes.js @@ -47,8 +47,11 @@ Ext.define('Traccar.store.MapTypes', { key: 'custom', name: Strings.mapCustom }, { - key: 'custom2', - name: Strings.mapCustom + ' 2' + key: 'googley', + name: 'Google Maps (satélite)' + }, { + key: 'googlem', + name: 'Google Maps (mapa)' }, { key: 'customArcgis', name: Strings.mapCustomArcgis diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js index fefe4de..507ee7a 100644 --- a/web/app/view/map/BaseMap.js +++ b/web/app/view/map/BaseMap.js @@ -50,15 +50,6 @@ Ext.define('Traccar.view.map.BaseMap', { }) }), new ol.layer.Tile({ - title: Strings.mapCustom + ' 2', - type: 'base', - visible: type === 'custom2', - source: new ol.source.XYZ({ - url: 'https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga', - attributions: '' - }) - }), - new ol.layer.Tile({ title: Strings.mapCustomArcgis, type: 'base', visible: type === 'customArcgis', @@ -77,6 +68,24 @@ Ext.define('Traccar.view.map.BaseMap', { }) }), new ol.layer.Tile({ + title: 'Google Maps (satélite)', + type: 'base', + visible: type === 'googley', + source: new ol.source.XYZ({ + url: 'https://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}&s=Ga', + attributions: '' + }) + }), + new ol.layer.Tile({ + title: 'Google Maps (mapa)', + type: 'base', + visible: type === 'googlem', + source: new ol.source.XYZ({ + url: 'https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&s=Ga', + attributions: '' + }) + }), + new ol.layer.Tile({ title: Strings.mapOsm, type: 'base', visible: type === 'osm' || type === 'wikimedia' || !type, |