Update leaflet providers to 1.1.17

2025-11-28 02:54:12 +01:00 · 2017-07-06 16:51:37 +02:00
parent 170c7e8d8e
commit ad4b61f696
8 changed files with 74 additions and 27 deletions
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Contao CMS.
 This package contains following packages:

 - [leaflet 1.1.0](http://leafletjs.com)
- - [Leaflet-providers 1.1.15](http://leaflet-extras.github.io/leaflet-providers)
+ - [Leaflet-providers 1.1.17](http://leaflet-extras.github.io/leaflet-providers)
 - [Leaflet.markercluster 1.0.6](https://github.com/Leaflet/Leaflet.markercluster)
 - [Leaflet-omnivore 0.3.4](https://github.com/mapbox/leaflet-omnivore)
 - [Leaflet.loading 0.1.24](https://github.com/ebrelsford/Leaflet.loading)
--- a/assets/leaflet-providers/CHANGELOG.md
+++ b/assets/leaflet-providers/CHANGELOG.md
@@ -1,9 +1,25 @@

 # Leaflet-providers changelog

+## 1.1.17 (2017-06-29)
+ - Added `maxZoom` for `Hydda` provider [242](https://github.com/leaflet-extras/leaflet-providers/pull/242)
+ - Fixed `maxZoom` for all layers from the `thunderforest` provider
+ - Added protocol relativity to the url for `OpenStreetMap.DE` variant.
+ - Added `OpenStreetMap.BZH` [#255](https://github.com/leaflet-extras/leaflet-providers/pull/255)
+ - Added `nlmaps` provider [#254](https://github.com/leaflet-extras/leaflet-providers/pull/254)
+
+## 1.1.16 (2016-11-04)
+ - Updates to reflect changes in [BasemapAT](http://leaflet-extras.github.io/leaflet-providers/preview/#filter=BasemapAT) by [@ximex](https://github.com/ximex), [#232]((https://github.com/leaflet-extras/leaflet-providers/pull/232), [#233]((https://github.com/leaflet-extras/leaflet-providers/pull/233)
+ - Bump leaflet version in tests and preview to 1.0.1.
+ - Added some layers from http://justicemap.org [#224](https://github.com/leaflet-extras/leaflet-providers/pull/224).
+
+## 1.1.15 (2016-08-09)
+ - [Stamen terrain](http://leaflet-extras.github.io/leaflet-providers/preview/#filter=Stamen.Terrain) now has world coverage [#223](https://github.com/leaflet-extras/leaflet-providers/pull/223)
+ - OSM France `maxZoom`: 20 ([#222](https://github.com/leaflet-extras/leaflet-providers/pull/222), fixes [#221](https://github.com/leaflet-extras/leaflet-providers/issues/221))
+
 ## 1.1.14 (2016-07-15)
- Remove MapQuest, fixes #219
- Accidently skipped v1.1.12 and v1.1.13
+ - Remove MapQuest, fixes #219
+ - Accidently skipped v1.1.12 and v1.1.13

 ## 1.1.11 (2016-06-04)
 - Added protocol relativity to OSM FR, OSM HOT and Hydda providers (#214, #215).
--- a/assets/leaflet-providers/bower.json
+++ b/assets/leaflet-providers/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "leaflet-providers",
-  "version": "1.1.15",
+  "version": "1.1.17",
  "homepage": "https://github.com/leaflet-extras/leaflet-providers",
  "description": "An extension to Leaflet that contains configurations for various free tile providers.",
  "dependencies": {
--- a/assets/leaflet-providers/index.html
+++ b/assets/leaflet-providers/index.html
@@ -6,7 +6,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<!-- Leaflet style. REQUIRED! -->
-	<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.css" />
+	<link rel="stylesheet" href="http://unpkg.com/leaflet@1.0.3/dist/leaflet.css" />
 	<style>
 		html { height: 100% }
 		body { height: 100%; margin: 0; padding: 0;}
@@ -26,7 +26,7 @@
 	</div>
 	<div id="map" class="map"></div>

-	<script src="//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0-rc.1/leaflet.js"></script>
+	<script src="http://unpkg.com/leaflet@1.0.3/dist/leaflet.js"></script>
 	<script src="leaflet-providers.js"></script>
 	<script>
 		var map = L.map('map', {
@@ -46,7 +46,6 @@
 			'Thunderforest Transport': L.tileLayer.provider('Thunderforest.Transport'),
 			'Thunderforest Landscape': L.tileLayer.provider('Thunderforest.Landscape'),
 			'Hydda Full': L.tileLayer.provider('Hydda.Full'),
-			'MapBox Example': L.tileLayer.provider('MapBox', {id: 'mapbox.streets', accessToken: 'pk.eyJ1IjoiZ3V0ZW55ZSIsImEiOiJmNjJlMDNmYTUyMzNjMzQxZmY4Mzc1ZmFiYmExNjMxOSJ9.xgl1PBwQV9CtwW-usedrcQ'}),
 			'Stamen Toner': L.tileLayer.provider('Stamen.Toner'),
 			'Stamen Terrain': L.tileLayer.provider('Stamen.Terrain'),
 			'Stamen Watercolor': L.tileLayer.provider('Stamen.Watercolor'),
--- a/assets/leaflet-providers/leaflet-providers.js
+++ b/assets/leaflet-providers/leaflet-providers.js
@@ -110,7 +110,7 @@
 					}
 				},
 				DE: {
-					url: 'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png',
+					url: '//{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png',
 					options: {
 						maxZoom: 18
 					}
@@ -144,30 +144,29 @@
 			}
 		},
 		Thunderforest: {
-			url: '//{s}.tile.thunderforest.com/{variant}/{z}/{x}/{y}.png',
+			url: '//{s}.tile.thunderforest.com/{variant}/{z}/{x}/{y}.png?apikey={apikey}',
 			options: {
 				attribution:
 					'&copy; <a href="http://www.thunderforest.com/">Thunderforest</a>, {attribution.OpenStreetMap}',
-				variant: 'cycle'
+				variant: 'cycle',
+				apikey: '<insert your api key here>',
+				maxZoom: 22
 			},
 			variants: {
 				OpenCycleMap: 'cycle',
 				Transport: {
 					options: {
-						variant: 'transport',
-						maxZoom: 19
+						variant: 'transport'
 					}
 				},
 				TransportDark: {
 					options: {
-						variant: 'transport-dark',
-						maxZoom: 19
+						variant: 'transport-dark'
 					}
 				},
 				SpinalMap: {
 					options: {
-						variant: 'spinal-map',
-						maxZoom: 11
+						variant: 'spinal-map'
 					}
 				},
 				Landscape: 'landscape',
@@ -201,6 +200,7 @@
 		Hydda: {
 			url: '//{s}.tile.openstreetmap.se/hydda/{variant}/{z}/{x}/{y}.png',
 			options: {
+				maxZoom: 18,
 				variant: 'full',
 				attribution: 'Tiles courtesy of <a href="http://openstreetmap.se/" target="_blank">OpenStreetMap Sweden</a> &mdash; Map data {attribution.OpenStreetMap}'
 			},
@@ -216,7 +216,9 @@
 				attribution:
 					'Imagery from <a href="http://mapbox.com/about/maps/">MapBox</a> &mdash; ' +
 					'Map data {attribution.OpenStreetMap}',
-				subdomains: 'abcd'
+				subdomains: 'abcd',
+				id: 'streets',
+				accessToken: '<insert your access token here>',
 			}
 		},
 		Stamen: {
@@ -528,7 +530,7 @@
 			}
 		},
 		BasemapAT: {
-			url: '//maps{s}.wien.gv.at/basemap/{variant}/normal/google3857/{z}/{y}/{x}.{format}',
+			url: 'https://maps{s}.wien.gv.at/basemap/{variant}/normal/google3857/{z}/{y}/{x}.{format}',
 			options: {
 				maxZoom: 19,
 				attribution: 'Datenquelle: <a href="www.basemap.at">basemap.at</a>',
@@ -538,7 +540,12 @@
 				variant: 'geolandbasemap'
 			},
 			variants: {
-				basemap: 'geolandbasemap',
+				basemap: {
+					options: {
+						maxZoom: 20, // currently only in Vienna
+						variant: 'geolandbasemap'
+					}
+				},
 				grau: 'bmapgrau',
 				overlay: 'bmapoverlay',
 				highdpi: {
@@ -549,6 +556,7 @@
 				},
 				orthofoto: {
 					options: {
+						maxZoom: 20, // currently only in Vienna
 						variant: 'bmaporthofoto30cm',
 						format: 'jpeg'
 					}
@@ -628,6 +636,30 @@
 				maxZoom: 18,
 				subdomains: '0123',
 			}
+		},
+		JusticeMap: {
+			// Justice Map (http://www.justicemap.org/)
+			// Visualize race and income data for your community, county and country.
+			// Includes tools for data journalists, bloggers and community activists.
+			url: 'http://www.justicemap.org/tile/{size}/{variant}/{z}/{x}/{y}.png',
+			options: {
+				attribution: '<a href="http://www.justicemap.org/terms.php">Justice Map</a>',
+				// one of 'county', 'tract', 'block'
+				size: 'county',
+				// Bounds for USA, including Alaska and Hawaii
+				bounds: [[14, -180], [72, -56]]
+			},
+			variants: {
+				income: 'income',
+				americanIndian: 'indian',
+				asian: 'asian',
+				black: 'black',
+				hispanic: 'hispanic',
+				multi: 'multi',
+				nonWhite: 'nonwhite',
+				white: 'white',
+				plurality: 'plural'
+			}
 		}
 	};

--- a/assets/leaflet-providers/leaflet-providers.min.js
+++ b/assets/leaflet-providers/leaflet-providers.min.js
--- a/assets/leaflet-providers/package.json
+++ b/assets/leaflet-providers/package.json
@@ -1,6 +1,6 @@
 {
  "name": "leaflet-providers",
-  "version": "1.1.15",
+  "version": "1.1.17",
  "description": "An extension to Leaflet that contains configurations for various free tile providers.",
  "main": "leaflet-providers.js",
  "repository": {
@@ -9,7 +9,7 @@
  },
  "scripts": {
    "test": "npm run lint && npm run testsuite",
-    "testsuite": "mocha-phantomjs tests/index.html",
+    "testsuite": "phantomjs ./node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js tests/index.html",
    "lint": "eslint --config .eslintrc leaflet-providers.js index.html preview/*.js preview/*.html tests/*",
    "min": "uglifyjs leaflet-providers.js -mc -o leaflet-providers.min.js",
    "release": "mversion patch -m"
@@ -26,12 +26,12 @@
  ],
  "devDependencies": {
    "chai": "^2.3.0",
-    "eslint": "^2.7.0",
-    "eslint-plugin-html": "^1.4.0",
+    "eslint": "^3.16.1",
+    "eslint-plugin-html": "^2.0.1",
    "mocha": "^2.2.4",
-    "mocha-phantomjs": "^3.5.3",
+    "mocha-phantomjs-core": "^2.0.1",
    "mversion": "^1.3.0",
-    "phantomjs": "1.9.7-15",
+    "phantomjs-prebuilt": "^2.1.4",
    "uglify-js": "^2.4.15"
  },
  "autoupdate": {
--- a/module/config/config.php
+++ b/module/config/config.php
@@ -27,7 +27,7 @@ $GLOBALS['LEAFLET_LIBRARIES']['leaflet'] = array
 $GLOBALS['LEAFLET_LIBRARIES']['leaflet-providers'] = array
 (
    'name'       => 'Leaflet-providers',
-    'version'    => '1.1.15',
+    'version'    => '1.1.17',
    'license'    => '<a href="https://github.com/leaflet-extras/leaflet-providers/blob/master/license.md" target="_blank">BSD-2-Clause</a>',
    'homepage'   => 'http://leaflet-extras.github.io/leaflet-providers',
    'javascript' => 'assets/leaflet/libs/leaflet-providers/leaflet-providers.min.js'