From 3b0f7304db66d560e241511f3c9dc6ebaf31013d Mon Sep 17 00:00:00 2001 From: Edward Valley Date: Sun, 14 Jul 2019 20:36:11 -0400 Subject: Changes after first review --- web/app/store/MapTypes.js | 8 ++++---- web/app/view/map/BaseMap.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'web/app') diff --git a/web/app/store/MapTypes.js b/web/app/store/MapTypes.js index f75bbaa5..88d54bfa 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 0b39ae33..0ab48e87 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')) -- cgit v1.2.3