From 5ffe20792148a6dff6fbb7b6447de664050af083 Mon Sep 17 00:00:00 2001 From: Roman Zoller Date: Mon, 12 Mar 2018 08:46:20 +0100 Subject: [PATCH] Use https everywhere for OSM links (#6082) * Use https everywhere for OSM tile URLs Use https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png instead of http://{s}.tile.osm.org/{z}/{x}/{y}.png http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png * Use https everywhere for OSM attribution link Use https://www.openstreetmap.org/copyright instead of http://www.openstreetmap.org/copyright http://osm.org/copyright --- build/leafdoc-templates/html.hbs | 2 +- debug/hacks/jitter.html | 4 ++-- debug/map/control-layers.html | 6 +++--- debug/map/controls.html | 4 ++-- debug/map/geolocation.html | 4 ++-- debug/map/image-overlay.html | 4 ++-- debug/map/layer_remove_add.html | 4 ++-- debug/map/map-mobile.html | 4 ++-- debug/map/map-popup.html | 4 ++-- debug/map/map-scaled.html | 4 ++-- debug/map/map.html | 4 ++-- debug/map/marker-autopan.html | 4 ++-- debug/map/markers.html | 4 ++-- debug/map/max-bounds-bouncy.html | 4 ++-- debug/map/max-bounds-infinite.html | 4 ++-- debug/map/max-bounds.html | 4 ++-- debug/map/opacity.html | 4 ++-- debug/map/popup.html | 4 ++-- debug/map/rollup.html | 4 ++-- debug/map/scroll.html | 4 ++-- debug/map/tooltip.html | 4 ++-- debug/map/wms.html | 4 ++-- debug/map/zoom-delta.html | 4 ++-- debug/map/zoom-remain-centered.html | 4 ++-- debug/map/zoomlevels.html | 6 +++--- debug/map/zoompan.html | 2 +- debug/tests/add_remove_layers.html | 2 +- debug/tests/canvasloop.html | 4 ++-- debug/tests/click_on_canvas.html | 4 ++-- debug/tests/custom-panes.html | 4 ++-- debug/tests/detached-dom-memory-leak.html | 2 +- debug/tests/doubleclick-events-slowdown.html | 4 ++-- debug/tests/dragging_and_copyworldjump.html | 2 +- debug/tests/dragging_cursors.html | 2 +- debug/tests/event-perf-2.html | 4 ++-- debug/tests/mousemove_on_polygons.html | 4 ++-- debug/tests/opacity.html | 4 ++-- debug/tests/popup_offset.html | 4 ++-- debug/tests/popupcontextmenuclicks.html | 4 ++-- debug/tests/reuse_popups.html | 4 ++-- debug/tests/rtl.html | 4 ++-- debug/tests/rtl2.html | 2 +- debug/tests/svg_clicks.html | 2 +- debug/tests/tile-events.html | 2 +- debug/tests/touch-zoom-bounce.html | 2 +- debug/vector/bounds-extend.html | 2 +- debug/vector/feature-group-bounds.html | 4 ++-- debug/vector/geojson.html | 4 ++-- debug/vector/inherit-dashArray.html | 2 +- debug/vector/moving-canvas.html | 2 +- debug/vector/rectangle.html | 4 ++-- debug/vector/route.js | 4 ++-- debug/vector/touchzoomemu.html | 2 +- debug/vector/vector-bounds.html | 4 ++-- debug/vector/vector-canvas.html | 4 ++-- debug/vector/vector-mobile.html | 4 ++-- debug/vector/vector-simple.html | 4 ++-- debug/vector/vector.html | 4 ++-- debug/vector/vector2.html | 4 ++-- docs/_layouts/v2.html | 6 +++--- docs/_posts/2013-02-20-guest-post-draw.md | 8 ++++---- docs/edit.html | 2 +- docs/examples/custom-icons/example-one-icon.md | 4 ++-- docs/examples/custom-icons/example.md | 4 ++-- docs/examples/map-panes/example.md | 2 +- docs/examples/zoom-levels/example-delta.md | 2 +- docs/examples/zoom-levels/example-fractional.md | 2 +- docs/examples/zoom-levels/example-scale.md | 2 +- docs/examples/zoom-levels/example-setzoom.md | 2 +- docs/examples/zoom-levels/example-zero.md | 2 +- docs/index.html | 8 ++++---- docs/reference-0.7.7.html | 2 +- docs/reference-1.0.0.html | 4 ++-- docs/reference-1.0.2.html | 4 ++-- docs/reference-1.0.3.html | 4 ++-- docs/reference-1.1.0.html | 4 ++-- docs/reference-1.2.0.html | 4 ++-- docs/reference-1.3.0.html | 4 ++-- src/layer/tile/TileLayer.js | 2 +- 79 files changed, 142 insertions(+), 142 deletions(-) diff --git a/build/leafdoc-templates/html.hbs b/build/leafdoc-templates/html.hbs index a4d1d5ec..77ebfb9e 100644 --- a/build/leafdoc-templates/html.hbs +++ b/build/leafdoc-templates/html.hbs @@ -142,7 +142,7 @@
-

© 2017 Vladimir Agafonkin. Maps © OpenStreetMap contributors.

+

© 2017 Vladimir Agafonkin. Maps © OpenStreetMap contributors.

diff --git a/debug/hacks/jitter.html b/debug/hacks/jitter.html index 09be27de..14858f81 100644 --- a/debug/hacks/jitter.html +++ b/debug/hacks/jitter.html @@ -24,8 +24,8 @@ diff --git a/debug/map/markers.html b/debug/map/markers.html index 07bf9d5a..0730f3ea 100644 --- a/debug/map/markers.html +++ b/debug/map/markers.html @@ -54,8 +54,8 @@ console.log('poly click'); }); - var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { - attribution: '© OpenStreetMap contributors', + var osm = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + attribution: '© OpenStreetMap contributors', }).addTo(map); diff --git a/debug/map/max-bounds-bouncy.html b/debug/map/max-bounds-bouncy.html index 464c4cf6..bd6d866a 100644 --- a/debug/map/max-bounds-bouncy.html +++ b/debug/map/max-bounds-bouncy.html @@ -20,8 +20,8 @@ diff --git a/debug/vector/vector.html b/debug/vector/vector.html index 333d5797..5b953c14 100644 --- a/debug/vector/vector.html +++ b/debug/vector/vector.html @@ -13,8 +13,8 @@ @@ -105,7 +105,7 @@ {{ content }}
-

© 2017 Vladimir Agafonkin. Maps © OpenStreetMap contributors.

+

© 2017 Vladimir Agafonkin. Maps © OpenStreetMap contributors.

diff --git a/docs/_posts/2013-02-20-guest-post-draw.md b/docs/_posts/2013-02-20-guest-post-draw.md index 9a058781..5d5fef3d 100644 --- a/docs/_posts/2013-02-20-guest-post-draw.md +++ b/docs/_posts/2013-02-20-guest-post-draw.md @@ -41,8 +41,8 @@ Leaflet.draw is very simple to drop into you Leaflet application. The following var map = L.map('map').setView([175.30867, -37.77914], 13); // add an OpenStreetMap tile layer - L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { - attribution: '© OpenStreetMap contributors' + L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + attribution: '© OpenStreetMap contributors' }).addTo(map); // Initialize the FeatureGroup to store editable layers @@ -116,8 +116,8 @@ Jacob Toye var map = L.map('map').setView([-37.77914, 175.30867], 16); // add an OpenStreetMap tile layer - L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', { - attribution: '© OpenStreetMap contributors' + L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + attribution: '© OpenStreetMap contributors' }).addTo(map); // Initialize the FeatureGroup to store editable layers diff --git a/docs/edit.html b/docs/edit.html index c22586c1..17e9118d 100644 --- a/docs/edit.html +++ b/docs/edit.html @@ -15,7 +15,7 @@ cssFile: 'https://unpkg.com/leaflet/dist/leaflet.css', css: 'body {\n\tmargin: 0;\n}\nhtml, body, #leaflet {\n\theight: 100%\n}', jsFile: 'https://unpkg.com/leaflet/dist/leaflet-src.js', - js: "var map = new L.Map('leaflet', {\n\tlayers: [\n\t\tnew L.TileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {\n\t\t\t'attribution': 'Map data © OpenStreetMap contributors'\n\t\t})\n\t],\n\tcenter: [0, 0],\n\tzoom: 0\n});" + js: "var map = new L.Map('leaflet', {\n\tlayers: [\n\t\tnew L.TileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {\n\t\t\t'attribution': 'Map data © OpenStreetMap contributors'\n\t\t})\n\t],\n\tcenter: [0, 0],\n\tzoom: 0\n});" }; var hash = location.hash.substr(1); diff --git a/docs/examples/custom-icons/example-one-icon.md b/docs/examples/custom-icons/example-one-icon.md index 137d1f5d..b5f909ec 100644 --- a/docs/examples/custom-icons/example-one-icon.md +++ b/docs/examples/custom-icons/example-one-icon.md @@ -5,8 +5,8 @@ title: Custom Icons Tutorial