Update leaflet providers.

2025-11-30 20:13:47 +01:00 · 2016-10-04 13:43:39 +02:00
parent 471e89c789
commit 9c3618a521
8 changed files with 101 additions and 161 deletions
--- a/assets/leaflet-providers/leaflet-providers.js
+++ b/assets/leaflet-providers/leaflet-providers.js
@@ -48,8 +48,6 @@
 					url: variant.url || provider.url,
 					options: L.Util.extend({}, provider.options, variantOptions)
 				};
-			} else if (typeof provider.url === 'function') {
-				provider.url = provider.url(parts.splice(1, parts.length - 1).join('.'));
 			}

 			var forceHTTP = window.location.protocol === 'file:' || provider.options.forceHTTP;
@@ -118,13 +116,14 @@
 					}
 				},
 				France: {
-					url: 'http://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png',
+					url: '//{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png',
 					options: {
+						maxZoom: 20,
 						attribution: '&copy; Openstreetmap France | {attribution.OpenStreetMap}'
 					}
 				},
 				HOT: {
-					url: 'http://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
+					url: '//{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png',
 					options: {
 						attribution: '{attribution.OpenStreetMap}, Tiles courtesy of <a href="http://hot.openstreetmap.org/" target="_blank">Humanitarian OpenStreetMap Team</a>'
 					}
@@ -140,7 +139,7 @@
 		OpenTopoMap: {
 			url: '//{s}.tile.opentopomap.org/{z}/{x}/{y}.png',
 			options: {
-				maxZoom: 16,
+				maxZoom: 17,
 				attribution: 'Map data: {attribution.OpenStreetMap}, <a href="http://viewfinderpanoramas.org">SRTM</a> | Map style: &copy; <a href="https://opentopomap.org">OpenTopoMap</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)'
 			}
 		},
@@ -148,7 +147,7 @@
 			url: '//{s}.tile.thunderforest.com/{variant}/{z}/{x}/{y}.png',
 			options: {
 				attribution:
-					'&copy; <a href="http://www.opencyclemap.org">OpenCycleMap</a>, {attribution.OpenStreetMap}',
+					'&copy; <a href="http://www.thunderforest.com/">Thunderforest</a>, {attribution.OpenStreetMap}',
 				variant: 'cycle'
 			},
 			variants: {
@@ -165,12 +164,19 @@
 						maxZoom: 19
 					}
 				},
+				SpinalMap: {
+					options: {
+						variant: 'spinal-map',
+						maxZoom: 11
+					}
+				},
 				Landscape: 'landscape',
-				Outdoors: 'outdoors'
+				Outdoors: 'outdoors',
+				Pioneer: 'pioneer'
 			}
 		},
 		OpenMapSurfer: {
-			url: 'http://openmapsurfer.uni-hd.de/tiles/{variant}/x={x}&y={y}&z={z}',
+			url: 'http://korona.geog.uni-heidelberg.de/tiles/{variant}/x={x}&y={y}&z={z}',
 			options: {
 				maxZoom: 20,
 				variant: 'roads',
@@ -193,7 +199,7 @@
 			}
 		},
 		Hydda: {
-			url: 'http://{s}.tile.openstreetmap.se/hydda/{variant}/{z}/{x}/{y}.png',
+			url: '//{s}.tile.openstreetmap.se/hydda/{variant}/{z}/{x}/{y}.png',
 			options: {
 				variant: 'full',
 				attribution: 'Tiles courtesy of <a href="http://openstreetmap.se/" target="_blank">OpenStreetMap Sweden</a> &mdash; Map data {attribution.OpenStreetMap}'
@@ -204,39 +210,6 @@
 				RoadsAndLabels: 'roads_and_labels'
 			}
 		},
-		MapQuestOpen: {
-			/* Mapquest does support https, but with a different subdomain:
-			 * https://otile{s}-s.mqcdn.com/tiles/1.0.0/{type}/{z}/{x}/{y}.{ext}
-			 * which makes implementing protocol relativity impossible.
-			 */
-			url: 'http://otile{s}.mqcdn.com/tiles/1.0.0/{type}/{z}/{x}/{y}.{ext}',
-			options: {
-				type: 'map',
-				ext: 'jpg',
-				attribution:
-					'Tiles Courtesy of <a href="http://www.mapquest.com/">MapQuest</a> &mdash; ' +
-					'Map data {attribution.OpenStreetMap}',
-				subdomains: '1234'
-			},
-			variants: {
-				OSM: {},
-				Aerial: {
-					options: {
-						type: 'sat',
-						attribution:
-							'Tiles Courtesy of <a href="http://www.mapquest.com/">MapQuest</a> &mdash; ' +
-							'Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency'
-					}
-				},
-				HybridOverlay: {
-					options: {
-						type: 'hyb',
-						ext: 'png',
-						opacity: 0.9
-					}
-				}
-			}
-		},
 		MapBox: {
 			url: '//api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}',
 			options: {
@@ -276,17 +249,15 @@
 				Terrain: {
 					options: {
 						variant: 'terrain',
-						minZoom: 4,
-						maxZoom: 18,
-						bounds: [[22, -132], [70, -56]]
+						minZoom: 0,
+						maxZoom: 18
 					}
 				},
 				TerrainBackground: {
 					options: {
 						variant: 'terrain-background',
-						minZoom: 4,
-						maxZoom: 18,
-						bounds: [[22, -132], [70, -56]]
+						minZoom: 0,
+						maxZoom: 18
 					}
 				},
 				TopOSMRelief: {
@@ -422,8 +393,8 @@
 			 */
 			url:
 				'//{s}.{base}.maps.cit.api.here.com/maptile/2.1/' +
-				'maptile/{mapID}/{variant}/{z}/{x}/{y}/256/png8?' +
-				'app_id={app_id}&app_code={app_code}',
+				'{type}/{mapID}/{variant}/{z}/{x}/{y}/{size}/{format}?' +
+				'app_id={app_id}&app_code={app_code}&lg={language}',
 			options: {
 				attribution:
 					'Map &copy; 1987-2014 <a href="http://developer.here.com">HERE</a>',
@@ -433,7 +404,11 @@
 				'app_code': '<insert your app_code here>',
 				base: 'base',
 				variant: 'normal.day',
-				maxZoom: 20
+				maxZoom: 20,
+				type: 'maptile',
+				language: 'eng',
+				format: 'png8',
+				size: '256'
 			},
 			variants: {
 				normalDay: 'normal.day',
@@ -448,6 +423,23 @@
 				normalNightGrey: 'normal.night.grey',
 				normalNightGreyMobile: 'normal.night.grey.mobile',

+				basicMap: {
+					options: {
+						type: 'basetile'
+					}
+				},
+				mapLabels: {
+					options: {
+						type: 'labeltile',
+						format: 'png'
+					}
+				},
+				trafficFlow: {
+					options: {
+						base: 'traffic',
+						type: 'flowtile'
+					}
+				},
 				carnavDayGrey: 'carnav.day.grey',
 				hybridDay: {
 					options: {
@@ -483,26 +475,6 @@
 				}
 			}
 		},
-		Acetate: {
-			url: 'http://a{s}.acetate.geoiq.com/tiles/{variant}/{z}/{x}/{y}.png',
-			options: {
-				attribution:
-					'&copy;2012 Esri & Stamen, Data from OSM and Natural Earth',
-				subdomains: '0123',
-				minZoom: 2,
-				maxZoom: 18,
-				variant: 'acetate-base'
-			},
-			variants: {
-				basemap: 'acetate-base',
-				terrain: 'terrain',
-				all: 'acetate-hillshading',
-				foreground: 'acetate-fg',
-				roads: 'acetate-roads',
-				labels: 'acetate-labels',
-				hillshading: 'hillshading'
-			}
-		},
 		FreeMapSK: {
 			url: 'http://t{s}.freemap.sk/T/{z}/{x}/{y}.jpeg',
 			options: {
@@ -640,75 +612,21 @@
 			}
 		},
 		NLS: {
-			// Maps from http://maps.nls.uk/geo/explore/
-			url: '//nls-{s}.tileserver.com/{variant}/{z}/{x}/{y}.jpg',
+			// NLS maps are copyright National library of Scotland.
+			// http://maps.nls.uk/projects/api/index.html
+			// Please contact NLS for anything other than non-commercial low volume usage
+			//
+			// Map sources: Ordnance Survey 1:1m to 1:63K, 1920s-1940s
+			//   z0-9  - 1:1m
+			//  z10-11 - quarter inch (1:253440)
+			//  z12-18 - one inch (1:63360)
+			url: '//nls-{s}.tileserver.com/nls/{z}/{x}/{y}.jpg',
 			options: {
 				attribution: '<a href="http://geo.nls.uk/maps/">National Library of Scotland Historic Maps</a>',
 				bounds: [[49.6, -12], [61.7, 3]],
 				minZoom: 1,
 				maxZoom: 18,
 				subdomains: '0123',
-			},
-			variants: {
-				// OS 1:1m to 1:10K, 1900s
-				//   z0-10 - 1:1m
-				//  z11-12 - ?
-				//  z13-14 - one inch (1:63360)
-				//  z15-18 - six inch (1:10560)
-				'OS_1900': 'NLS_API',
-				// OS 1:1m to 1:63K, 1920s-1940s
-				//   z0-9  - 1:1m
-				//  z10-11 - quarter inch (1:253440)
-				//  z12-18 - one inch (1:63360)
-				'OS_1920': 'nls',
-				'OS_opendata': {
-					url: 'http://geo.nls.uk/maps/opendata/{z}/{x}/{y}.png',
-					options: {
-						maxZoom: 16
-					}
-				},
-				// OS six inch, 1843 - 1882
-				'OS_6inch_1st': {
-					url: 'http://geo.nls.uk/maps/os/six_inch/{z}/{x}/{y}.png',
-					options: {
-						tms: true,
-						minZoom: 6,
-						maxZoom: 16,
-						bounds: [[49.86261, -8.66444], [60.89421, 1.7785]]
-					}
-				},
-				// OS six inch, 1888 - 1913
-				'OS_6inch': 'os_6_inch_gb',
-				// OS 1:25000, 1937 - 1961
-				'OS_25k': '25k',
-				// OS one inch, 1945 - 1947
-				'OS_npe': {
-					url: 'http://geo.nls.uk/maps/os/newpopular/{z}/{x}/{y}.png',
-					options: {
-						tms: true,
-						minZoom: 3,
-						maxZoom: 15
-					}
-				},
-				// OS one inch, 1952 - 1961
-				'OS_7th': 'os7gb',
-				// OS 1:1056, 1893 - 1896
-				'OS_London': {
-					options: {
-						variant: 'London_1056',
-						minZoom: 9,
-						bounds: [[51.177621, -0.708618], [51.618016, 0.355682]]
-					}
-				},
-				'GSGS_Ireland': {
-					url: 'http://geo.nls.uk/maps/ireland/gsgs4136/{z}/{x}/{y}.png',
-					options: {
-						tms: true,
-						minZoom: 5,
-						maxZoom: 15,
-						bounds: [[51.371780, -10.810546], [55.422779, -5.262451]]
-					}
-				}
 			}
 		}
 	};