Merge pull request #31 from Schlumpf/https

Use HTTPS for all tile servers

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)

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
 --------------------------------------------------------------------------
 */
@@ -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, "; }

mod_osmod.xml

@@ -4,12 +4,12 @@
     <!-- Metadata -->
     <name>OSModul</name>
     <author>Martin Kröll</author>
-    <creationDate>09.10.2017</creationDate>
-    <copyright>(c) 2012-2017 Martin Kröll</copyright>
+    <creationDate>24.02.2018</creationDate>
+    <copyright>(c) 2012-2018 Martin Kröll</copyright>
     <license>https://www.gnu.org/licenses/gpl-3.0.html GNU/GPL</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>https://extensions.joomla.org/extensions/owner/schlumpf</authorUrl>
-    <version>2.14</version>
+    <version>2.15</version>
     <description>MOD_OSMOD_DESCRIPTION</description>
 
     <!-- Update servers -->