diff --git a/src/worldmap.test.ts b/src/worldmap.test.ts index c34d688..9759579 100644 --- a/src/worldmap.test.ts +++ b/src/worldmap.test.ts @@ -329,7 +329,7 @@ describe('Worldmap', () => { initialZoom: 1, colors: ['red', 'blue', 'green'], }, - tileServer: 'CartoDB Positron', + tileServer: 'CARTO Positron', }; worldMap = new WorldMap(ctrl, document.getElementsByClassName('mapcontainer')[0]); worldMap.createMap(); diff --git a/src/worldmap.ts b/src/worldmap.ts index 341f9a6..92469a3 100644 --- a/src/worldmap.ts +++ b/src/worldmap.ts @@ -3,18 +3,18 @@ import * as L from './libs/leaflet'; import WorldmapCtrl from './worldmap_ctrl'; const tileServers = { - 'CartoDB Positron': { - url: 'https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png', + 'CARTO Positron': { + url: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', attribution: - '© OpenStreetMap ' + - '© CartoDB', + '© OpenStreetMap ' + + '© CARTO', subdomains: 'abcd', }, - 'CartoDB Dark': { - url: 'https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png', + 'CARTO Dark': { + url: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png', attribution: - '© OpenStreetMap ' + - '© CartoDB', + '© OpenStreetMap ' + + '© CARTO', subdomains: 'abcd', }, }; diff --git a/src/worldmap_ctrl.ts b/src/worldmap_ctrl.ts index 4aa746c..e547836 100644 --- a/src/worldmap_ctrl.ts +++ b/src/worldmap_ctrl.ts @@ -83,13 +83,13 @@ export default class WorldmapCtrl extends MetricsPanelCtrl { setMapProvider(contextSrv) { this.tileServer = contextSrv.user.lightTheme - ? "CartoDB Positron" - : "CartoDB Dark"; + ? "CARTO Positron" + : "CARTO Dark"; this.setMapSaturationClass(); } setMapSaturationClass() { - if (this.tileServer === "CartoDB Dark") { + if (this.tileServer === "CARTO Dark") { this.saturationClass = "map-darken"; } else { this.saturationClass = "";