diff options
| author | Edward Valley <ed.valley@yandex.com> | 2019-07-14 20:36:11 -0400 |
|---|---|---|
| committer | Edward Valley <ed.valley@yandex.com> | 2019-07-14 20:36:11 -0400 |
| commit | 3b0f7304db66d560e241511f3c9dc6ebaf31013d (patch) | |
| tree | 5373469d62c04ac8c370c7b2ab47a63cf2101ac5 /web | |
| parent | 66fbb00c9ad302d746ca09e51a2a6a821aefab88 (diff) | |
| download | etbsa-traccar-web-3b0f7304db66d560e241511f3c9dc6ebaf31013d.tar.gz etbsa-traccar-web-3b0f7304db66d560e241511f3c9dc6ebaf31013d.tar.bz2 etbsa-traccar-web-3b0f7304db66d560e241511f3c9dc6ebaf31013d.zip | |
Changes after first review
Diffstat (limited to 'web')
| -rw-r--r-- | web/app/store/MapTypes.js | 8 | ||||
| -rw-r--r-- | web/app/view/map/BaseMap.js | 4 | ||||
| -rw-r--r-- | web/l10n/en.json | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/web/app/store/MapTypes.js b/web/app/store/MapTypes.js index f75bbaa..88d54bf 100644 --- a/web/app/store/MapTypes.js +++ b/web/app/store/MapTypes.js @@ -47,10 +47,10 @@ Ext.define('Traccar.store.MapTypes', { key: 'wikimedia', name: Strings.mapWikimedia }, { - key: 'customXyzFormat', - name: Strings.mapCustomXyzFormat + key: 'custom', + name: Strings.mapCustom }, { - key: 'customArcgisRest', - name: Strings.mapCustomArcgisRest + key: 'customArcgis', + name: Strings.mapCustomArcgis }] }); diff --git a/web/app/view/map/BaseMap.js b/web/app/view/map/BaseMap.js index 0b39ae3..0ab48e8 100644 --- a/web/app/view/map/BaseMap.js +++ b/web/app/view/map/BaseMap.js @@ -38,7 +38,7 @@ Ext.define('Traccar.view.map.BaseMap', { bingKey = server.get('bingKey'); switch (type) { - case 'customXyzFormat': + case 'custom': layer = new ol.layer.Tile({ source: new ol.source.XYZ({ url: Ext.String.htmlDecode(server.get('mapUrl')), @@ -46,7 +46,7 @@ Ext.define('Traccar.view.map.BaseMap', { }) }); break; - case 'customArcgisRest': + case 'customArcgis': layer = new ol.layer.Tile({ source: new ol.source.TileArcGISRest({ url: Ext.String.htmlDecode(server.get('mapUrl')) diff --git a/web/l10n/en.json b/web/l10n/en.json index 07e7609..7374785 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -231,9 +231,8 @@ "serverForceSettings": "Force Settings", "mapTitle": "Map", "mapLayer": "Map Layer", - "mapCustom": "Custom Map", - "mapCustomXyzFormat": "Custom (XYZ)", - "mapCustomArcgisRest": "Custom (ArcGIS REST)", + "mapCustom": "Custom (XYZ)", + "mapCustomArcgis": "Custom (ArcGIS)", "mapCarto": "Carto Basemaps", "mapOsm": "Open Street Map", "mapBingKey": "Bing Maps Key", |