[PLUGINS] ~maj globale

[lhc/web/www.git] / www / plugins / gis / lib / leaflet / plugins / leaflet-providers.js

diff --git a/www/plugins/gis/lib/leaflet/plugins/leaflet-providers.js b/www/plugins/gis/lib/leaflet/plugins/leaflet-providers.js
index bc82990..22e2cbd 100644 (file)
--- a/www/plugins/gis/lib/leaflet/plugins/leaflet-providers.js
+++ b/www/plugins/gis/lib/leaflet/plugins/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: '© 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>)'
                        }
                },
@@ -200,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}'
@@ -211,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: {
@@ -283,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: {