Skip to content

Commit d39002c

Browse files
JeroenDeDauwclaude
andcommitted
Remove defunct built-in Leaflet layers
Several built-in leaflet-providers layers point at tile services that have shut down, so they only clutter the layer selector with entries that fail to load. This removes them from $egMapsLeafletAvailableLayers and $egMapsLeafletAvailableOverlayLayers: - Stamen (service shut down October 2023; gone from leaflet-providers) - Hydda (discontinued 2020; gone from leaflet-providers) - MapQuest Open (shut down 2016; gone from leaflet-providers) - OpenMapSurfer (gone from leaflet-providers) - HikeBike and OpenStreetMap.BlackAndWhite (hosted on the decommissioned tiles.wmflabs.org) - GeoportailFrance (the wxs.ign.fr endpoint has been retired) - Esri.DeLorme (base map retired by Esri) The matching $egMapsLeafletLayersApiKeys and $egMapsLeafletLayerDependencies entries for MapQuest Open and GeoportailFrance are dropped too. Users who relied on any of these can define a replacement with the $egMapsLeafletLayerDefinitions setting added in 13.1.0. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent df2bc37 commit d39002c

2 files changed

Lines changed: 2 additions & 31 deletions

File tree

DefaultSettings.php

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@
175175
'egMapsLeafletAvailableLayers' => [
176176
'OpenStreetMap' => true,
177177
'OpenStreetMap.DE' => true,
178-
'OpenStreetMap.BlackAndWhite' => true,
179178
'OpenStreetMap.HOT' => true,
180179
'OpenTopoMap' => true,
181180
'Thunderforest.OpenCycleMap' => true,
@@ -185,24 +184,8 @@
185184
'Thunderforest.Landscape' => true,
186185
'Thunderforest.Outdoors' => true,
187186
'Thunderforest.Pioneer' => true,
188-
'OpenMapSurfer.Roads' => true,
189-
'OpenMapSurfer.Grayscale' => true,
190-
'Hydda.Full' => true,
191-
'Hydda.Base' => true,
192187
//'MapBox' => false, // todo: implement setting api key
193-
'Stamen.Toner' => true,
194-
'Stamen.TonerBackground' => true,
195-
'Stamen.TonerHybrid' => true,
196-
'Stamen.TonerLines' => true,
197-
'Stamen.TonerLabels' => true,
198-
'Stamen.TonerLite' => true,
199-
'Stamen.Watercolor' => true,
200-
'Stamen.Terrain' => true,
201-
'Stamen.TerrainBackground' => true,
202-
'Stamen.TopOSMRelief' => true,
203-
'Stamen.TopOSMFeatures' => true,
204188
'Esri.WorldStreetMap' => true,
205-
'Esri.DeLorme' => true,
206189
'Esri.WorldTopoMap' => true,
207190
'Esri.WorldImagery' => true,
208191
'Esri.WorldTerrain' => true,
@@ -211,7 +194,6 @@
211194
'Esri.OceanBasemap' => true,
212195
'Esri.NatGeoWorldMap' => true,
213196
'Esri.WorldGrayCanvas' => true,
214-
'MapQuestOpen' => true,
215197
//'HERE' => false, // todo: implement setting api key
216198
'FreeMapSK' => true,
217199
'MtbMap' => true,
@@ -221,8 +203,6 @@
221203
'CartoDB.DarkMatter' => true,
222204
'CartoDB.DarkMatterNoLabels' => true,
223205
'CartoDB.DarkMatterOnlyLabels' => true,
224-
'HikeBike.HikeBike' => true,
225-
'HikeBike.HillShading' => true,
226206
'BasemapAT.basemap' => true,
227207
'BasemapAT.grau' => true,
228208
'BasemapAT.overlay' => true,
@@ -232,14 +212,9 @@
232212
'NASAGIBS.ModisTerraBands367CR' => true,
233213
'NASAGIBS.ViirsEarthAtNight2012' => true,
234214
'NLS' => true,
235-
'GeoportailFrance' => true,
236-
'GeoportailFrance.parcels' => true,
237-
'GeoportailFrance.ignMaps' => true,
238-
'GeoportailFrance.orthos' => true
239215
],
240216

241217
'egMapsLeafletAvailableOverlayLayers' => [
242-
'OpenMapSurfer.AdminBounds' => true,
243218
'OpenSeaMap' => true,
244219
'OpenWeatherMap.Clouds' => true,
245220
'OpenWeatherMap.CloudsClassic' => true,
@@ -252,7 +227,6 @@
252227
'OpenWeatherMap.Wind' => true,
253228
'OpenWeatherMap.Temperature' => true,
254229
'OpenWeatherMap.Snow' => true,
255-
'Hydda.RoadsAndLabels' => true,
256230
'NASAGIBS.ModisTerraLSTDay' => true,
257231
'NASAGIBS.ModisTerraSnowCover' => true,
258232
'NASAGIBS.ModisTerraAOD' => true,
@@ -306,14 +280,10 @@
306280

307281
'egMapsLeafletLayersApiKeys' => [
308282
'MapBox' => '',
309-
'MapQuestOpen' => '',
310283
'Thunderforest' => '',
311-
'GeoportailFrance' => ''
312284
],
313285

314-
'egMapsLeafletLayerDependencies' => [
315-
'MapQuestOpen' => 'https://open.mapquestapi.com/sdk/leaflet/v2.2/mq-map.js?key=',
316-
],
286+
'egMapsLeafletLayerDependencies' => [],
317287

318288

319289

RELEASE-NOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ Released on TBD.
1010
* Added an on-wiki JSON configuration page at `MediaWiki:Maps` exposing most Maps settings, grouped by service and topic (general map, coordinate, geocoding, Semantic MediaWiki, Leaflet and Google Maps options), including the Leaflet custom layer definitions and available layers. It is editable only by administrators and interface administrators, is validated on save, and is combined with `LocalSettings.php` with the wiki page taking precedence. Secrets, script-injection primitives and setup-time settings stay exclusive to `LocalSettings.php`. Set `$egMapsEnableInWikiConfig` to `false` to disable it.
1111
* Editing or viewing the `MediaWiki:Maps` page now shows a configuration reference listing every key, its accepted value and the `LocalSettings.php` setting it overrides, next to a link to the full documentation. Creating the page preloads a small working example.
1212
* Hardened the custom Leaflet layer definitions used by `$egMapsLeafletLayerDefinitions` and the config page (breaking change): the `url` and `errorTileUrl` must be `http(s)` URLs, only an allowlist of Leaflet `options` is kept, and `attribution` is sanitized to plain text and `http(s)` links. Definitions relying on raw HTML attribution or non-allowlisted options need updating.
13+
* Removed built-in Leaflet layers whose upstream tile services have shut down: Stamen, Hydda, MapQuest Open, OpenMapSurfer, HikeBike, GeoportailFrance, Esri.DeLorme, and OpenStreetMap.BlackAndWhite. If you still use one of these, define a replacement with the `$egMapsLeafletLayerDefinitions` setting.
1314

1415
## Maps 13.1.0
1516

0 commit comments

Comments
 (0)