From 5348c8bd41c28da175e392494918c9d5be7371ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ll?= Date: Sat, 24 Feb 2018 15:42:35 +0100 Subject: [PATCH 1/2] Use https for all tile servers. --- helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helper.php b/helper.php index f5271ea..1565a3e 100644 --- a/helper.php +++ b/helper.php @@ -154,10 +154,10 @@ private static function mpPins($parPins, $id){ public static function javascript($params, $id){ // load baselayerURL $baselayerSettings = ''; - if ($params->get('baselayer', 'mapnik') == 'mapnikde') { $baselayerURL = 'http://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png'; $baselayerSettings = "maxZoom: 18, "; } + if ($params->get('baselayer', 'mapnik') == 'mapnikde') { $baselayerURL = 'https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png'; $baselayerSettings = "maxZoom: 18, "; } else if($params->get('baselayer', 'mapnik') == 'stamenwater') { $baselayerURL = 'https://stamen-tiles-{s}.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png'; $baselayerSettings = "subdomains: 'abcd', minZoom: 1, maxZoom: 16, "; } else if($params->get('baselayer', 'mapnik') == 'opentopomap') { $baselayerURL = 'https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png'; $baselayerSettings = "maxZoom: 16, "; } - else if($params->get('baselayer', 'mapnik') == 'openmapsurfer') { $baselayerURL = 'http://korona.geog.uni-heidelberg.de/tiles/roads/x={x}&y={y}&z={z}'; $baselayerSettings = "maxZoom: 20, "; } + else if($params->get('baselayer', 'mapnik') == 'openmapsurfer') { $baselayerURL = 'https://korona.geog.uni-heidelberg.de/tiles/roads/x={x}&y={y}&z={z}'; $baselayerSettings = "maxZoom: 20, "; } else if($params->get('baselayer', 'mapnik') == 'humanitarian') { $baselayerURL = 'https://{s}.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png'; $baselayerSettings = "maxZoom: 20, "; } else if($params->get('baselayer', 'mapnik') == 'custom') { $baselayerURL = $params->get('customBaselayerURL', ''); } else /* unknown layer and mapnik */ { $baselayerURL = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; $baselayerSettings = "maxZoom: 19, "; } From ed539c667216adfc99731de407c3e7f8aee32764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ll?= Date: Sat, 24 Feb 2018 15:48:22 +0100 Subject: [PATCH 2/2] Set version to v2.15 --- CHANGES | 3 +++ helper.php | 2 +- mod_osmod.xml | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index d2e7aeb..4a18839 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ OSModul Changelog ----------------- +v2.15 + - Use HTTPS for all tile servers + v2.14 - Possibility do disable user interaction - Add Dutch translation (Thanks to Roelof Ymker) diff --git a/helper.php b/helper.php index 1565a3e..cd9046f 100644 --- a/helper.php +++ b/helper.php @@ -3,7 +3,7 @@ # mod_osmod # ------------------------------------------------------------------------ # author Martin Kröll -# copyright Copyright (C) 2012-2015 Martin Kröll. All Rights Reserved. +# copyright Copyright (C) 2012-2018 Martin Kröll. All Rights Reserved. # @license - http://www.gnu.org/licenses/gpl-3.0.html GNU/GPL -------------------------------------------------------------------------- */ diff --git a/mod_osmod.xml b/mod_osmod.xml index 3b5adf3..665d90d 100644 --- a/mod_osmod.xml +++ b/mod_osmod.xml @@ -4,12 +4,12 @@ OSModul Martin Kröll - 09.10.2017 - (c) 2012-2017 Martin Kröll + 24.02.2018 + (c) 2012-2018 Martin Kröll https://www.gnu.org/licenses/gpl-3.0.html GNU/GPL osmodul@kr-ll.de https://extensions.joomla.org/extensions/owner/schlumpf - 2.14 + 2.15 MOD_OSMOD_DESCRIPTION