From 32b5b8fb4528b0ede730448f9b6d0d7fe3abea04 Mon Sep 17 00:00:00 2001 From: Marat Kopytjuk Date: Sat, 8 May 2021 11:33:20 +0200 Subject: [PATCH 1/5] Add Azuremaps layer --- leaflet-providers.js | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/leaflet-providers.js b/leaflet-providers.js index ec343513..a3ae97ce 100644 --- a/leaflet-providers.js +++ b/leaflet-providers.js @@ -1045,6 +1045,48 @@ variants: { pistes: 'pistes', } + }, + AzureMaps: { + url: + 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ + '&tilesetId={variant}&x={x}&y={y}&zoom={z}&subscription-key={subscription_key}', + options: { + attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview for details.', + api_version: '2.0', + variant: 'microsoft.imagery', + subscription_key: '', + }, + variants: { + MicrosoftImagery: 'microsoft.imagery', + MicrosoftBaseDarkGrey: 'microsoft.base.darkgrey', + MicrosoftBaseRoad: 'microsoft.base.road', + MicrosoftBaseHybridRoad: 'microsoft.base.hybrid.road', + MicrosoftTerraMain: 'microsoft.terra.main', + MicrosoftWeatherInfraredMain: { + url: + 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ + '&tilesetId={variant}&x={x}&y={y}&zoom={z}'+ + '&timeStamp={timeStamp}' + + '&subscription-key={subscription_key}', + options: { + timeStamp: '2021-05-08T09:03:00Z', + attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview#uri-parameters for details.', + variant: 'microsoft.weather.infrared.main', + }, + }, + MicrosoftWeatherRadarMain: { + url: + 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ + '&tilesetId={variant}&x={x}&y={y}&zoom={z}'+ + '&timeStamp={timeStamp}' + + '&subscription-key={subscription_key}', + options: { + timeStamp: '2021-05-08T09:03:00Z', + attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview#uri-parameters for details.', + variant: 'microsoft.weather.radar.main', + }, + } + }, } }; From a5935bcb7042efd6d6372eae27125f5ba124d4e6 Mon Sep 17 00:00:00 2001 From: Marat Kopytjuk Date: Sat, 8 May 2021 11:37:54 +0200 Subject: [PATCH 2/5] Add azuremaps language parameter --- leaflet-providers.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/leaflet-providers.js b/leaflet-providers.js index a3ae97ce..1548ca10 100644 --- a/leaflet-providers.js +++ b/leaflet-providers.js @@ -1049,12 +1049,14 @@ AzureMaps: { url: 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ - '&tilesetId={variant}&x={x}&y={y}&zoom={z}&subscription-key={subscription_key}', + '&tilesetId={variant}&x={x}&y={y}&zoom={z}&language={language}'+ + '&subscription-key={subscription_key}', options: { attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview for details.', api_version: '2.0', variant: 'microsoft.imagery', subscription_key: '', + language: 'en-US', }, variants: { MicrosoftImagery: 'microsoft.imagery', @@ -1066,7 +1068,7 @@ url: 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ '&tilesetId={variant}&x={x}&y={y}&zoom={z}'+ - '&timeStamp={timeStamp}' + + '&timeStamp={timeStamp}&language={language}' + '&subscription-key={subscription_key}', options: { timeStamp: '2021-05-08T09:03:00Z', @@ -1078,7 +1080,7 @@ url: 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ '&tilesetId={variant}&x={x}&y={y}&zoom={z}'+ - '&timeStamp={timeStamp}' + + '&timeStamp={timeStamp}&language={language}' + '&subscription-key={subscription_key}', options: { timeStamp: '2021-05-08T09:03:00Z', From e211b85404c0737704eb18bc0fffa5e70243e241 Mon Sep 17 00:00:00 2001 From: Marat Kopytjuk Date: Wed, 26 May 2021 16:57:05 +0200 Subject: [PATCH 3/5] Fix linting. --- leaflet-providers.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/leaflet-providers.js b/leaflet-providers.js index 1548ca10..34a01b5d 100644 --- a/leaflet-providers.js +++ b/leaflet-providers.js @@ -1048,14 +1048,14 @@ }, AzureMaps: { url: - 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ + 'https://atlas.microsoft.com/map/tile?api-version={apiVersion}'+ '&tilesetId={variant}&x={x}&y={y}&zoom={z}&language={language}'+ - '&subscription-key={subscription_key}', + '&subscription-key={subscriptionKey}', options: { attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview for details.', - api_version: '2.0', + apiVersion: '2.0', variant: 'microsoft.imagery', - subscription_key: '', + subscriptionKey: '', language: 'en-US', }, variants: { @@ -1066,10 +1066,10 @@ MicrosoftTerraMain: 'microsoft.terra.main', MicrosoftWeatherInfraredMain: { url: - 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ + 'https://atlas.microsoft.com/map/tile?api-version={apiVersion}'+ '&tilesetId={variant}&x={x}&y={y}&zoom={z}'+ '&timeStamp={timeStamp}&language={language}' + - '&subscription-key={subscription_key}', + '&subscription-key={subscriptionKey}', options: { timeStamp: '2021-05-08T09:03:00Z', attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview#uri-parameters for details.', @@ -1078,10 +1078,10 @@ }, MicrosoftWeatherRadarMain: { url: - 'https://atlas.microsoft.com/map/tile?api-version={api_version}'+ + 'https://atlas.microsoft.com/map/tile?api-version={apiVersion}'+ '&tilesetId={variant}&x={x}&y={y}&zoom={z}'+ '&timeStamp={timeStamp}&language={language}' + - '&subscription-key={subscription_key}', + '&subscription-key={subscriptionKey}', options: { timeStamp: '2021-05-08T09:03:00Z', attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview#uri-parameters for details.', From e948a59199415e01e7b961c68b88cb8bbf30d867 Mon Sep 17 00:00:00 2001 From: Marat Kopytjuk Date: Wed, 26 May 2021 19:11:35 +0200 Subject: [PATCH 4/5] Adapt attribution option --- leaflet-providers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/leaflet-providers.js b/leaflet-providers.js index 34a01b5d..b528b1f4 100644 --- a/leaflet-providers.js +++ b/leaflet-providers.js @@ -1072,7 +1072,7 @@ '&subscription-key={subscriptionKey}', options: { timeStamp: '2021-05-08T09:03:00Z', - attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview#uri-parameters for details.', + attribution: 'See https://docs.microsoft.com/en-US/rest/api/maps/renderv2/getmaptilepreview#uri-parameters for details.', variant: 'microsoft.weather.infrared.main', }, }, @@ -1084,7 +1084,7 @@ '&subscription-key={subscriptionKey}', options: { timeStamp: '2021-05-08T09:03:00Z', - attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview#uri-parameters for details.', + attribution: 'See https://docs.microsoft.com/en-US/rest/api/maps/renderv2/getmaptilepreview#uri-parameters for details.', variant: 'microsoft.weather.radar.main', }, } From a84825d175c5d826b835711b61416c718c78e3b5 Mon Sep 17 00:00:00 2001 From: Marat Kopytjuk Date: Wed, 26 May 2021 19:20:40 +0200 Subject: [PATCH 5/5] Adapt attribution to Azure Maps --- leaflet-providers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/leaflet-providers.js b/leaflet-providers.js index b528b1f4..bc04f2d9 100644 --- a/leaflet-providers.js +++ b/leaflet-providers.js @@ -1052,7 +1052,7 @@ '&tilesetId={variant}&x={x}&y={y}&zoom={z}&language={language}'+ '&subscription-key={subscriptionKey}', options: { - attribution: 'See https://docs.microsoft.com/de-de/rest/api/maps/renderv2/getmaptilepreview for details.', + attribution: 'See https://docs.microsoft.com/en-US/rest/api/maps/renderv2/getmaptilepreview for details.', apiVersion: '2.0', variant: 'microsoft.imagery', subscriptionKey: '',