[PLUGINS] ~maj gis v4.26.1-->4.26.10

[lhc/web/clavette_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 a02cc19..72616c6 100755 (executable)
--- a/www/plugins/gis/gis_options.php
+++ b/www/plugins/gis/gis_options.php
@@ -9,7 +9,7 @@ $GLOBALS['logo_libelles']['id_gis'] = _T('gis:libelle_logo_gis');
 
 $config = @unserialize($GLOBALS['meta']['gis']);
 
-$GLOBALS['gis_layers'] = array (
+$gis_layers = array (
        'openstreetmap_mapnik' => array(
                'nom' => 'OpenStreetMap',
                'layer' => 'L.tileLayer.provider("OpenStreetMap")'
@@ -31,7 +31,7 @@ $GLOBALS['gis_layers'] = array (
                'layer' => 'L.Google("ROADMAP")'
        ),
        'google_satellite' => array(
-               'nom' => 'Google Satelitte',
+               'nom' => 'Google Satellite',
                'layer' => 'L.Google("SATELLITE")'
        ),
        'google_terrain' => array(
@@ -58,6 +58,10 @@ $GLOBALS['gis_layers'] = array (
                'nom' => 'Thunderforest Outdoors',
                'layer' => 'L.tileLayer.provider("Thunderforest.Outdoors")'
        ),
+       'opentopomap' => array(
+               'nom' => 'OpenTopoMap',
+               'layer' => 'L.tileLayer.provider("OpenTopoMap")'
+       ),
        'openmapsurfer' => array(
                'nom' => 'OpenMapSurfer',
                'layer' => 'L.tileLayer.provider("OpenMapSurfer")'
@@ -160,4 +164,8 @@ $GLOBALS['gis_layers'] = array (
        )
 );
 
-?>
\ No newline at end of file
+if (isset($GLOBALS['gis_layers']) and is_array($GLOBALS['gis_layers'])) {
+       $GLOBALS['gis_layers'] = array_merge($gis_layers,$GLOBALS['gis_layers']);
+} else {
+       $GLOBALS['gis_layers'] = $gis_layers;
+}