X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=www%2Fplugins%2Fgis%2Fgis_options.php;fp=www%2Fplugins%2Fgis%2Fgis_options.php;h=3b8244838116204a2e7ff7f93048a923af0b4c60;hb=4f443dce95ff6f8221c189880a70c74ce1c1f238;hp=19d235369e68dea035a50c7710f812ea55e791f9;hpb=4a628e9b277d3617535f99d663ca79fa2e891177;p=lhc%2Fweb%2Fwww.git

diff --git a/www/plugins/gis/gis_options.php b/www/plugins/gis/gis_options.php
index 19d23536..3b824483 100755
--- a/www/plugins/gis/gis_options.php
+++ b/www/plugins/gis/gis_options.php
@@ -4,12 +4,13 @@ if (!defined('_ECRIRE_INC_VERSION')) {
 	return;
 }
 
-// pour compat cf http://zone.spip.org/trac/spip-zone/changeset/79911/
+// pour compat cf https://zone.spip.org/trac/spip-zone/changeset/79911/
 define('_DIR_LIB_GIS', find_in_path('lib/leaflet/'));
 
 $GLOBALS['logo_libelles']['id_gis'] = _T('gis:libelle_logo_gis');
 
 $config = @unserialize($GLOBALS['meta']['gis']);
+$api_key_bing = isset($config['api_key_bing']) ? trim($config['api_key_bing']) : '';
 
 $gis_layers = array (
 	'openstreetmap_mapnik' => array(
@@ -46,7 +47,7 @@ $gis_layers = array (
 	),
 	'bing_aerial' => array(
 		'nom' => 'Bing Aerial',
-		'layer' => 'L.BingLayer("'.$config['api_key_bing'].'")'
+		'layer' => 'L.BingLayer("'.$api_key_bing.'")'
 	),
 	'opentopomap' => array(
 		'nom' => 'OpenTopoMap',
@@ -126,19 +127,19 @@ $gis_layers = array (
 	),
 	'cartodb_positron' => array(
 		'nom' => 'CartoDB Positron',
-		'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png")' : 'L.tileLayer.provider("CartoDB.Positron")'
+		'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.Positron").options)' : 'L.tileLayer.provider("CartoDB.Positron")'
 	),
 	'cartodb_positron_base' => array(
 		'nom' => 'CartoDB Positron Base',
-		'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_nolabels/{z}/{x}/{y}.png")' : 'L.tileLayer.provider("CartoDB.PositronNoLabels")'
+		'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/light_nolabels/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.PositronNoLabels").options)' : 'L.tileLayer.provider("CartoDB.PositronNoLabels")'
 	),
 	'cartodb_darkmatter' => array(
 		'nom' => 'CartoDB DarkMatter',
-		'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png")' : 'L.tileLayer.provider("CartoDB.DarkMatter")'
+		'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.DarkMatter").options)' : 'L.tileLayer.provider("CartoDB.DarkMatter")'
 	),
 	'cartodb_darkmatter_base' => array(
 		'nom' => 'CartoDB DarkMatter Base',
-		'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}.png")' : 'L.tileLayer.provider("CartoDB.DarkMatterNoLabels")'
+		'layer' => substr($GLOBALS['meta']['adresse_site'], 0, 5) == 'https' ? 'L.tileLayer("https://cartodb-basemaps-{s}.global.ssl.fastly.net/dark_nolabels/{z}/{x}/{y}.png", L.tileLayer.provider("CartoDB.DarkMatterNoLabels").options)' : 'L.tileLayer.provider("CartoDB.DarkMatterNoLabels")'
 	)
 );