[PLUGINS] ~gis v4.41.1 --> v4.43.1

[lhc/web/www.git] / www / plugins / gis / gis_options.php

diff --git a/www/plugins/gis/gis_options.php b/www/plugins/gis/gis_options.php
index ca3b0cd..19d2353 100755 (executable)
--- a/www/plugins/gis/gis_options.php
+++ b/www/plugins/gis/gis_options.php
@@ -1,9 +1,11 @@
 <?php
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+       return;
+}
 
 // pour compat cf http://zone.spip.org/trac/spip-zone/changeset/79911/
-define('_DIR_LIB_GIS',find_in_path('lib/leaflet/'));
+define('_DIR_LIB_GIS', find_in_path('lib/leaflet/'));
 
 $GLOBALS['logo_libelles']['id_gis'] = _T('gis:libelle_logo_gis');
 
@@ -32,44 +34,20 @@ $gis_layers = array (
        ),
        'google_roadmap' => array(
                'nom' => 'Google Roadmap',
-               'layer' => 'L.Google("ROADMAP")'
+               'layer' => 'L.gridLayer.googleMutant({type:"roadmap"})'
        ),
        'google_satellite' => array(
                'nom' => 'Google Satellite',
-               'layer' => 'L.Google("SATELLITE")'
+               'layer' => 'L.gridLayer.googleMutant({type:"satellite"})'
        ),
        'google_terrain' => array(
                'nom' => 'Google Terrain',
-               'layer' => 'L.Google("TERRAIN")'
+               'layer' => 'L.gridLayer.googleMutant({type:"terrain"})'
        ),
        'bing_aerial' => array(
                'nom' => 'Bing Aerial',
                'layer' => 'L.BingLayer("'.$config['api_key_bing'].'")'
        ),
-       'thunderforest_opencyclemap' => array(
-               'nom' => 'Thunderforest OpenCycleMap',
-               'layer' => 'L.tileLayer.provider("Thunderforest.OpenCycleMap")'
-       ),
-       'thunderforest_transport' => array(
-               'nom' => 'Thunderforest Transport',
-               'layer' => 'L.tileLayer.provider("Thunderforest.Transport")'
-       ),
-       'thunderforest_landscape' => array(
-               'nom' => 'Thunderforest Landscape',
-               'layer' => 'L.tileLayer.provider("Thunderforest.Landscape")'
-       ),
-       'thunderforest_outdoors' => array(
-               'nom' => 'Thunderforest Outdoors',
-               'layer' => 'L.tileLayer.provider("Thunderforest.Outdoors")'
-       ),
-       'thunderforest_spinalmap' => array(
-               'nom' => 'Thunderforest SpinalMap',
-               'layer' => 'L.tileLayer.provider("Thunderforest.SpinalMap")'
-       ),
-       'thunderforest_pioneer' => array(
-               'nom' => 'Thunderforest Pioneer',
-               'layer' => 'L.tileLayer.provider("Thunderforest.Pioneer")'
-       ),
        'opentopomap' => array(
                'nom' => 'OpenTopoMap',
                'layer' => 'L.tileLayer.provider("OpenTopoMap")'
@@ -90,14 +68,6 @@ $gis_layers = array (
                'nom' => 'Hydda Base',
                'layer' => 'L.tileLayer.provider("Hydda.Base")'
        ),
-       'mapquestopen_osm' => array(
-               'nom' => 'Mapquest Open',
-               'layer' => 'L.tileLayer.provider("MapQuestOpen.OSM")'
-       ),
-       'mapquestopen_aerial' => array(
-               'nom' => 'Mapquest Open Aerial',
-               'layer' => 'L.tileLayer.provider("MapQuestOpen.Aerial")'
-       ),
        'stamen_toner' => array(
                'nom' => 'Stamen Toner',
                'layer' => 'L.tileLayer.provider("Stamen.Toner")'
@@ -156,24 +126,24 @@ $gis_layers = array (
        ),
        'cartodb_positron' => array(
                'nom' => 'CartoDB Positron',
-               'layer' => '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")'
        ),
        'cartodb_positron_base' => array(
                'nom' => 'CartoDB Positron Base',
-               'layer' => '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")'
        ),
        'cartodb_darkmatter' => array(
                'nom' => 'CartoDB DarkMatter',
-               'layer' => '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")'
        ),
        'cartodb_darkmatter_base' => array(
                'nom' => 'CartoDB DarkMatter Base',
-               'layer' => '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")'
        )
 );
 
 if (isset($GLOBALS['gis_layers']) and is_array($GLOBALS['gis_layers'])) {
-       $GLOBALS['gis_layers'] = array_merge($gis_layers,$GLOBALS['gis_layers']);
+       $GLOBALS['gis_layers'] = array_merge($gis_layers, $GLOBALS['gis_layers']);
 } else {
        $GLOBALS['gis_layers'] = $gis_layers;
 }