From 9a60703cebb5eb21fa54e24edf9a52c660dde5e0 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Wed, 7 Mar 2018 01:05:33 +0100 Subject: [PATCH] Update leaflet-providers --- .../static/leaflet/leaflet-providers.js | 118 +++++++++++++----- 1 file changed, 85 insertions(+), 33 deletions(-) diff --git a/sigal/themes/galleria/static/leaflet/leaflet-providers.js b/sigal/themes/galleria/static/leaflet/leaflet-providers.js index 22e2cbd..cecf7a3 100644 --- a/sigal/themes/galleria/static/leaflet/leaflet-providers.js +++ b/sigal/themes/galleria/static/leaflet/leaflet-providers.js @@ -50,11 +50,6 @@ }; } - var forceHTTP = window.location.protocol === 'file:' || provider.options.forceHTTP; - if (provider.url.indexOf('//') === 0 && forceHTTP) { - provider.url = 'http:' + provider.url; - } - // If retina option is set if (provider.options.retina) { // Check retina screen @@ -95,7 +90,7 @@ L.TileLayer.Provider.providers = { OpenStreetMap: { - url: '//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + url: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', options: { maxZoom: 19, attribution: @@ -110,64 +105,70 @@ } }, DE: { - url: 'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', + url: 'https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', options: { maxZoom: 18 } }, France: { - url: '//{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', + url: 'https://{s}.tile.openstreetmap.fr/osmfr/{z}/{x}/{y}.png', options: { maxZoom: 20, attribution: '© Openstreetmap France | {attribution.OpenStreetMap}' } }, HOT: { - url: '//{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', + url: 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png', options: { attribution: '{attribution.OpenStreetMap}, Tiles courtesy of Humanitarian OpenStreetMap Team' } + }, + BZH: { + url: 'http://tile.openstreetmap.bzh/br/{z}/{x}/{y}.png', + options: { + attribution: '{attribution.OpenStreetMap}, Tiles courtesy of Breton OpenStreetMap Team', + bounds: [[46.2, -5.5], [50, 0.7]] + } } } }, OpenSeaMap: { - url: 'http://tiles.openseamap.org/seamark/{z}/{x}/{y}.png', + url: 'https://tiles.openseamap.org/seamark/{z}/{x}/{y}.png', options: { attribution: 'Map data: © OpenSeaMap contributors' } }, OpenTopoMap: { - url: '//{s}.tile.opentopomap.org/{z}/{x}/{y}.png', + url: 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', options: { maxZoom: 17, attribution: 'Map data: {attribution.OpenStreetMap}, SRTM | Map style: © OpenTopoMap (CC-BY-SA)' } }, Thunderforest: { - url: '//{s}.tile.thunderforest.com/{variant}/{z}/{x}/{y}.png', + url: 'https://{s}.tile.thunderforest.com/{variant}/{z}/{x}/{y}.png?apikey={apikey}', options: { attribution: '© Thunderforest, {attribution.OpenStreetMap}', - variant: 'cycle' + variant: 'cycle', + apikey: '', + 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', @@ -176,7 +177,7 @@ } }, OpenMapSurfer: { - url: 'http://korona.geog.uni-heidelberg.de/tiles/{variant}/x={x}&y={y}&z={z}', + url: 'https://korona.geog.uni-heidelberg.de/tiles/{variant}/x={x}&y={y}&z={z}', options: { maxZoom: 20, variant: 'roads', @@ -199,8 +200,9 @@ } }, Hydda: { - url: '//{s}.tile.openstreetmap.se/hydda/{variant}/{z}/{x}/{y}.png', + url: 'https://{s}.tile.openstreetmap.se/hydda/{variant}/{z}/{x}/{y}.png', options: { + maxZoom: 18, variant: 'full', attribution: 'Tiles courtesy of OpenStreetMap Sweden — Map data {attribution.OpenStreetMap}' }, @@ -211,16 +213,18 @@ } }, MapBox: { - url: '//api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', + url: 'https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', options: { attribution: 'Imagery from MapBox — ' + 'Map data {attribution.OpenStreetMap}', - subdomains: 'abcd' + subdomains: 'abcd', + id: 'streets', + accessToken: '', } }, Stamen: { - url: '//stamen-tiles-{s}.a.ssl.fastly.net/{variant}/{z}/{x}/{y}.{ext}', + url: 'https://stamen-tiles-{s}.a.ssl.fastly.net/{variant}/{z}/{x}/{y}.{ext}', options: { attribution: 'Map tiles by Stamen Design, ' + @@ -277,7 +281,7 @@ } }, Esri: { - url: '//server.arcgisonline.com/ArcGIS/rest/services/{variant}/MapServer/tile/{z}/{y}/{x}', + url: 'https://server.arcgisonline.com/ArcGIS/rest/services/{variant}/MapServer/tile/{z}/{y}/{x}', options: { variant: 'World_Street_Map', attribution: 'Tiles © Esri' @@ -361,10 +365,11 @@ } }, OpenWeatherMap: { - url: 'http://{s}.tile.openweathermap.org/map/{variant}/{z}/{x}/{y}.png', + url: 'http://{s}.tile.openweathermap.org/map/{variant}/{z}/{x}/{y}.png?appid={apiKey}', options: { maxZoom: 19, attribution: 'Map data © OpenWeatherMap', + apiKey:'', opacity: 0.5 }, variants: { @@ -392,7 +397,7 @@ * envirionments. */ url: - '//{s}.{base}.maps.cit.api.here.com/maptile/2.1/' + + 'https://{s}.{base}.maps.cit.api.here.com/maptile/2.1/' + '{type}/{mapID}/{variant}/{z}/{x}/{y}/{size}/{format}?' + 'app_id={app_id}&app_code={app_code}&lg={language}', options: { @@ -494,7 +499,7 @@ } }, CartoDB: { - url: 'http://{s}.basemaps.cartocdn.com/{variant}/{z}/{x}/{y}.png', + url: 'https://cartodb-basemaps-{s}.global.ssl.fastly.net/{variant}/{z}/{x}/{y}.png', options: { attribution: '{attribution.OpenStreetMap} © CartoDB', subdomains: 'abcd', @@ -528,17 +533,22 @@ } }, 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: basemap.at', + attribution: 'Datenquelle: basemap.at', subdomains: ['', '1', '2', '3', '4'], format: 'png', bounds: [[46.358770, 8.782379], [49.037872, 17.189532]], variant: 'geolandbasemap' }, variants: { - basemap: 'geolandbasemap', + basemap: { + options: { + maxZoom: 20, // currently only in Vienna + variant: 'geolandbasemap' + } + }, grau: 'bmapgrau', overlay: 'bmapoverlay', highdpi: { @@ -549,14 +559,32 @@ }, orthofoto: { options: { + maxZoom: 20, // currently only in Vienna variant: 'bmaporthofoto30cm', format: 'jpeg' } } } }, + nlmaps: { + url: 'https://geodata.nationaalgeoregister.nl/tiles/service/wmts/{variant}/EPSG:3857/{z}/{x}/{y}.png', + options: { + minZoom: 6, + maxZoom: 19, + bounds: [[50.5, 3.25], [54, 7.6]], + attribution: 'Kaartgegevens © Kadaster' + }, + variants: { + 'standaard': 'brtachtergrondkaart', + 'pastel': 'brtachtergrondkaartpastel', + 'grijs': 'brtachtergrondkaartgrijs', + 'luchtfoto': { + 'url': 'https://geodata.nationaalgeoregister.nl/luchtfoto/rgb/wmts/1.0.0/2016_ortho25/EPSG:3857/{z}/{x}/{y}.png', + } + } + }, NASAGIBS: { - url: '//map1.vis.earthdata.nasa.gov/wmts-webmerc/{variant}/default/{time}/{tilematrixset}{maxZoom}/{z}/{y}/{x}.{format}', + url: 'https://map1.vis.earthdata.nasa.gov/wmts-webmerc/{variant}/default/{time}/{tilematrixset}{maxZoom}/{z}/{y}/{x}.{format}', options: { attribution: 'Imagery provided by services from the Global Imagery Browse Services (GIBS), operated by the NASA/GSFC/Earth Science Data and Information System ' + @@ -620,7 +648,7 @@ // 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', + url: 'https://nls-{s}.tileserver.com/nls/{z}/{x}/{y}.jpg', options: { attribution: 'National Library of Scotland Historic Maps', bounds: [[49.6, -12], [61.7, 3]], @@ -628,6 +656,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: 'Justice Map', + // 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' + } } };