From b49da13abebc52a0096c78631f2b7cece0b30d48 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 30 Oct 2015 23:40:15 +0100 Subject: [PATCH] Update leaflet providers to version 1.1.5. --- README.md | 2 +- assets/leaflet-providers/CHANGELOG.md | 27 ++++ assets/leaflet-providers/README.md | 8 +- assets/leaflet-providers/bower.json | 2 +- assets/leaflet-providers/index.html | 6 +- assets/leaflet-providers/leaflet-providers.js | 117 +++++++++++++++--- .../leaflet-providers.min.js | 2 +- assets/leaflet-providers/package.json | 16 ++- module/config/config.php | 2 +- 9 files changed, 154 insertions(+), 28 deletions(-) create mode 100644 assets/leaflet-providers/CHANGELOG.md diff --git a/README.md b/README.md index 1a1b8b1..d29c3d9 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Contao CMS. This package contains following packages: - [leaflet 0.7.5](http://leafletjs.com) - - [Leaflet-providers 1.0.12](http://leaflet-extras.github.io/leaflet-providers) + - [Leaflet-providers 1.1.5](http://leaflet-extras.github.io/leaflet-providers) - [Leaflet.markercluster 0.4.0](https://github.com/Leaflet/Leaflet.markercluster) - [Leaflet-omnivore 0.3.2](https://github.com/mapbox/leaflet-omnivore) - [Leaflet.loading 0.1.15](https://github.com/ebrelsford/Leaflet.loading) diff --git a/assets/leaflet-providers/CHANGELOG.md b/assets/leaflet-providers/CHANGELOG.md new file mode 100644 index 0000000..cd00403 --- /dev/null +++ b/assets/leaflet-providers/CHANGELOG.md @@ -0,0 +1,27 @@ + +# Leaflet-providers changelog + +## master version + +## 1.1.5 (2015-10-01) + - Improvements for the NLS layers (#182) by [@tomhughes](https://github.com/tomhughes) + - Check for valid bounds before fitting the preview map to undefined (fixes #185) + - Add bounds for FreeMapSK (fixes #184) + - Fix Stamen layers with `.jpg` extension (#187, fixes #184) + +## 1.1.4 (2015-09-27) + - Only include the interesting files in the npm package (#180) + - Add GSGS_Ireland to NLS provider with `tms:true` to invert y-axis (#181) + +## 1.1.3 (2015-09-26) + - Add various historical layers of the Natioanal library of Scotland (NLS) (#179) + - Add a page to visually check bounds (#179) + +## 1.1.2 (2015-09-05) + - Add CartoDB labels-only styles (#170 by [@almccon](https://github.com/almccon)) + - Implement commonjs module (#172) + - Added retina URL option (#177, [@routexl](https://github.com/routexl) + +## 1.1.1 (2015-06-22) + - Update Mapbox API to v4 (#167 by [@gutenye](https://github.com/gutenye)). + - Started maintaining a changelog in CHANGELOG.md. diff --git a/assets/leaflet-providers/README.md b/assets/leaflet-providers/README.md index 792372b..a633c07 100644 --- a/assets/leaflet-providers/README.md +++ b/assets/leaflet-providers/README.md @@ -15,6 +15,10 @@ L.tileLayer.provider('Stamen.Watercolor').addTo(map); Leaflet-providers tries to use `https://` if the page uses `https://` and the provider supports it. You can force the use of `http://` by passing `force_http: true` in the options argument. +## Retina tiles + +Some providers have retina tiles for which the URL only needs to be slightly adjusted, e.g. `-----@2x.png`. For this, add the retina option in the URL, e.g. `-----{retina}.png`, and set a retina value in the options, e.g. `retina: '@2x'`. If Leaflet detects a retina screen (`L.Browser.retina`), the retina option passed to the tileLayer is set to the value supplied, otherwise it's replaced by an empty string. + # Providers Leaflet-providers provides tile layers from different providers, including *OpenStreetMap*, *MapQuestOpen*, *Stamen*, *Esri* and *OpenWeatherMap*. The full listing of free to use layers can be [previewed](http://leaflet-extras.github.io/leaflet-providers/preview/index.html). The page will show you the name to use with `leaflet-providers.js` and the code to use it without dependencies. @@ -38,9 +42,9 @@ L.tileLayer.provider('HERE.terrainDay', { ### Mapbox -In order to use Mapbox maps, you must [register](https://tiles.mapbox.com/signup). If your user name is `YourName` and your map is called `MyMap` you can add it with: +In order to use Mapbox maps, you must [register](https://tiles.mapbox.com/signup). You can get map ID and ACCESS_TOKEN from [Mapbox projects](https://www.mapbox.com/projects): ```JavaScript -L.tileLayer.provider('MapBox.YourName.MyMap'); +L.tileLayer.provider('MapBox', {id: 'ID', accessToken: 'ACCESS_TOKEN'}).addTo(map); ``` ### Esri/ArcGIS diff --git a/assets/leaflet-providers/bower.json b/assets/leaflet-providers/bower.json index 3e8ff05..08b3bac 100644 --- a/assets/leaflet-providers/bower.json +++ b/assets/leaflet-providers/bower.json @@ -1,6 +1,6 @@ { "name": "leaflet-providers", - "version": "1.1.0", + "version": "1.1.5", "homepage": "https://github.com/leaflet-extras/leaflet-providers", "description": "An extension to Leaflet that contains configurations for various free tile providers.", "dependencies": { diff --git a/assets/leaflet-providers/index.html b/assets/leaflet-providers/index.html index 98f985b..d69e60d 100644 --- a/assets/leaflet-providers/index.html +++ b/assets/leaflet-providers/index.html @@ -6,7 +6,7 @@ - +