From 5fcbeb5e4149de2df9ebfdd4ccbda39a84ac06fb Mon Sep 17 00:00:00 2001 From: Jan Ingwer Baer Date: Sun, 20 Mar 2022 21:31:05 +0100 Subject: [PATCH 1/2] Fix HTTPS-bug --- mplleaflet/maptiles.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mplleaflet/maptiles.py b/mplleaflet/maptiles.py index 5234b03..3ea5af2 100644 --- a/mplleaflet/maptiles.py +++ b/mplleaflet/maptiles.py @@ -1,5 +1,5 @@ osm = ( - 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', + 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', 'Map data (c) OpenStreetMap contributors' ) From 6ebcd50b3336b03cbfad90236a676d693aee2dbb Mon Sep 17 00:00:00 2001 From: Jan Ingwer Baer Date: Sun, 20 Mar 2022 21:57:42 +0100 Subject: [PATCH 2/2] More changes to https --- mplleaflet/maptiles.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mplleaflet/maptiles.py b/mplleaflet/maptiles.py index 3ea5af2..5415301 100644 --- a/mplleaflet/maptiles.py +++ b/mplleaflet/maptiles.py @@ -4,49 +4,49 @@ ) mapquest_open = ( - 'http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', + 'https://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', 'Map tiles by MapQuest Data by OpenStreetMap, under CC BY SA.' ) mapbox_bright = ( - 'http://{s}.tiles.mapbox.com/v3/mapbox.world-bright/{z}/{x}/{y}.png', + 'https://{s}.tiles.mapbox.com/v3/mapbox.world-bright/{z}/{x}/{y}.png', 'Map tiles by Mapbox Data by OpenStreetMap, under CC BY SA.' ) thunderforest_landscape = ( - 'http://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png', + 'https://{s}.tile.thunderforest.com/landscape/{z}/{x}/{y}.png', '© OpenCycleMap, © OpenStreetMap' ) esri_aerial = ( - 'http://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}.png', + 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}.png', 'Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community' ) esri_natgeo = ( - 'http://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{z}/{y}/{x}.png', + 'https://server.arcgisonline.com/ArcGIS/rest/services/NatGeo_World_Map/MapServer/tile/{z}/{y}/{x}.png', 'Tiles © Esri — National Geographic, Esri, DeLorme, NAVTEQ, UNEP-WCMC, USGS, NASA, ESA, METI, NRCAN, GEBCO, NOAA, iPC' ) esri_worldtopo = ( - 'http://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}.png', + 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer/tile/{z}/{y}/{x}.png', 'Tiles © Esri — Esri, HERE, DeLorme, Intermap, increment P Corp., GEBCO, USGS, FAO, NPS, NRCAN, GeoBase, IGN, Kadaster NL, Ordnance Survey, Esri Japan, METI, Esri China (Hong Kong), swisstopo, MapmyIndia, © OpenStreetMap contributors, GIS User Community' ) stamen_wc = ( - 'http://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.png', + 'https://{s}.tile.stamen.com/watercolor/{z}/{x}/{y}.png', 'Map tiles by Stamen Design, CC BY 3.0 — Map data © OpenStreetMap' ) stamen_toner = ( - 'http://a.tile.stamen.com/toner/{z}/{x}/{y}.png', + 'https://a.tile.stamen.com/toner/{z}/{x}/{y}.png', 'Map tiles by Stamen Design, CC BY 3.0 — Map data © OpenStreetMap' ) cartodb_positron = ( - 'http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', + 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', '© OpenStreetMap © CartoDB' ) @@ -64,7 +64,7 @@ 'esri_worldtopo': esri_worldtopo } -_mb_url = 'http://{{s}}.tiles.mapbox.com/v3/{mapid}/{{z}}/{{x}}/{{y}}.png' +_mb_url = 'https://{{s}}.tiles.mapbox.com/v3/{mapid}/{{z}}/{{x}}/{{y}}.png' _mb_attribution = 'Terms & Feedback' def mapbox(mapid): url = _mb_url.format(mapid=mapid)