Changeset 104886 in spip-zone

Timestamp:

Jun 16, 2017, 4:12:08 PM (4 years ago)

Author:

brunobergot@…

Message:

version 4.43.7 : récupérer les options des couches cartodb aussi en https

sans ça on n'affichait plus les crédits, on perdait le maxzoom, etc

Location:

_plugins_/gis/trunk

Files:

• gis_options.php (modified) (1 diff)
• paquet.xml (modified) (1 diff)

_plugins_/gis/trunk/gis_options.php

@@ -127 +127 @@
         '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")'
         )
 );

_plugins_/gis/trunk/paquet.xml

@@ -2 +2 @@
         prefix="gis"
         categorie="divers"
-        version="4.43.6"
+        version="4.43.7"
         schema="2.1.0"
         etat="stable"