fix #6

mcguffin · Feb 9, 2019 · 72321cf · 72321cf
1 parent 7e2a526
commit 72321cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/etc/leaflet-providers.json b/etc/leaflet-providers.json
@@ -8,7 +8,7 @@
 		"variants": {
 			"Mapnik": {},
 			"BlackAndWhite": {
-				"url": "http://{s}.tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png",
+				"url": "https://tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png",
 				"options": {
 					"maxZoom": 18
 				}
@@ -498,7 +498,7 @@
 		}
 	},
 	"HikeBike": {
-		"url": "http://{s}.tiles.wmflabs.org/{variant}/{z}/{x}/{y}.png",
+		"url": "https://tiles.wmflabs.org/{variant}/{z}/{x}/{y}.png",
 		"options": {
 			"maxZoom": 19,
 			"attribution": "{attribution.OpenStreetMap}",

diff --git a/gulpfile.js b/gulpfile.js
@@ -67,6 +67,14 @@ L = {
 gulp.task('providers', function(cb){
 	require('./node_modules/leaflet-providers/leaflet-providers.js');
 	var providers = L.TileLayer.Provider.providers;
+
+	// patch insecure map tile URLs
+	if ( providers.OpenStreetMap.variants.BlackAndWhite.url.indexOf('http:') === 0 ) {
+		providers.OpenStreetMap.variants.BlackAndWhite.url = "https://tiles.wmflabs.org/bw-mapnik/{z}/{x}/{y}.png";
+	}
+	if ( providers.HikeBike.url.indexOf('http:') === 0 ) {
+		providers.HikeBike.url = "https://tiles.wmflabs.org/{variant}/{z}/{x}/{y}.png"
+	}
 	return fs.writeFile( './etc/leaflet-providers.json', JSON.stringify( providers, null, '\t' ), cb );
 });