[PLUGINS] ~maj globale

[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 730774c..6cf5881 100755 (executable)
--- a/www/plugins/gis/gis_options.php
+++ b/www/plugins/gis/gis_options.php
@@ -1,14 +1,17 @@
 <?php
 
-if (!defined('_ECRIRE_INC_VERSION')) return;
+if (!defined('_ECRIRE_INC_VERSION')) {
+       return;
+}
 
-define('_DIR_LIB_GIS','lib/leaflet-gis-4.8.7/');
+// pour compat cf http://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']);
 
-$GLOBALS['gis_layers'] = array (
+$gis_layers = array (
        'openstreetmap_mapnik' => array(
                'nom' => 'OpenStreetMap',
                'layer' => 'L.tileLayer.provider("OpenStreetMap")'
@@ -21,12 +24,20 @@ $GLOBALS['gis_layers'] = array (
                'nom' => 'OpenStreetMap DE',
                'layer' => 'L.tileLayer.provider("OpenStreetMap.DE")'
        ),
+       'openstreetmap_fr' => array(
+               'nom' => 'OpenStreetMap FR',
+               'layer' => 'L.tileLayer.provider("OpenStreetMap.France")'
+       ),
+       'openstreetmap_hot' => array(
+               'nom' => 'OpenStreetMap H.O.T.',
+               'layer' => 'L.tileLayer.provider("OpenStreetMap.HOT")'
+       ),
        'google_roadmap' => array(
                'nom' => 'Google Roadmap',
                'layer' => 'L.Google("ROADMAP")'
        ),
        'google_satellite' => array(
-               'nom' => 'Google Satelitte',
+               'nom' => 'Google Satellite',
                'layer' => 'L.Google("SATELLITE")'
        ),
        'google_terrain' => array(
@@ -53,6 +64,18 @@ $GLOBALS['gis_layers'] = 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")'
+       ),
        'openmapsurfer' => array(
                'nom' => 'OpenMapSurfer',
                'layer' => 'L.tileLayer.provider("OpenMapSurfer")'
@@ -61,13 +84,13 @@ $GLOBALS['gis_layers'] = array (
                'nom' => 'OpenMapSurfer Grayscale',
                'layer' => 'L.tileLayer.provider("OpenMapSurfer.Grayscale")'
        ),
-       'mapquestopen_osm' => array(
-               'nom' => 'Mapquest Open',
-               'layer' => 'L.tileLayer.provider("MapQuestOpen.OSM")'
+       'hydda' => array(
+               'nom' => 'Hydda',
+               'layer' => 'L.tileLayer.provider("Hydda")'
        ),
-       'mapquestopen_aerial' => array(
-               'nom' => 'Mapquest Open Aerial',
-               'layer' => 'L.tileLayer.provider("MapQuestOpen.Aerial")'
+       'hydda_base' => array(
+               'nom' => 'Hydda Base',
+               'layer' => 'L.tileLayer.provider("Hydda.Base")'
        ),
        'stamen_toner' => array(
                'nom' => 'Stamen Toner',
@@ -113,7 +136,6 @@ $GLOBALS['gis_layers'] = array (
                'nom' => 'Esri WorldPhysical',
                'layer' => 'L.tileLayer.provider("Esri.WorldPhysical")'
        ),
-       
        'esri_oceanbasemap' => array(
                'nom' => 'Esri OceanBasemap',
                'layer' => 'L.tileLayer.provider("Esri.OceanBasemap")'
@@ -126,30 +148,26 @@ $GLOBALS['gis_layers'] = array (
                'nom' => 'Esri WorldGrayCanvas',
                'layer' => 'L.tileLayer.provider("Esri.WorldGrayCanvas")'
        ),
-       'nokia_normalday' => array(
-               'nom' => 'Nokia normalDay',
-               'layer' => 'L.tileLayer.provider("Nokia.normalDay")'
-       ),
-       'nokia_normalgreyday' => array(
-               'nom' => 'Nokia normalGreyDay',
-               'layer' => 'L.tileLayer.provider("Nokia.normalGreyDay")'
-       ),
-       'nokia_satellitenolabelsday' => array(
-               'nom' => 'Nokia satelliteNoLabelsDay',
-               'layer' => 'L.tileLayer.provider("Nokia.satelliteNoLabelsDay")'
-       ),
-       'nokia_satelliteyeslabelsday' => array(
-               'nom' => 'Nokia satelliteYesLabelsDay',
-               'layer' => 'L.tileLayer.provider("Nokia.satelliteYesLabelsDay")'
+       '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")'
        ),
-       'nokia_terrainday' => array(
-               'nom' => 'Nokia terrainDay',
-               'layer' => 'L.tileLayer.provider("Nokia.terrainDay")'
+       '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")'
        ),
-       'acetate' => array(
-               'nom' => 'Acetate',
-               'layer' => 'L.tileLayer.provider("Acetate.all")'
+       '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")'
        ),
+       '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")'
+       )
 );
 
-?>
\ 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;
+}