Merge pull request #5126 from nboisteault/plotlyjs-update-and-custom-…

…bundle dataviz: update plotlyjs to v2.35.2 and do custom build to reduce file size
3liz · Dec 13, 2024 · f826c1d · f826c1d · 3liz-bot · Dec 16, 2024
2 parents ff3f500 + c4858ec
commit f826c1d
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 98 deletions.
diff --git a/lizmap/modules/dataviz/classes/dataviz.listener.php b/lizmap/modules/dataviz/classes/dataviz.listener.php
@@ -18,11 +18,11 @@ public function ongetMapAdditions($event)
         if ($dv->getStatus()) {
             $locale = substr(jApp::config()->locale, 0, 2);
             $js = array(
-                $bp.'assets/js/dataviz/plotly-latest.min.js',
+                $bp.'assets/js/dataviz/plotly-custom.min.js',
                 $bp.'assets/js/dataviz/dataviz.js',
             );
             if (in_array($locale, array('de', 'el', 'es', 'fr', 'it', 'nl', 'ro'))) {
-                $js[] = $bp.'assets/js/dataviz/plotly-locale-'.$locale.'-latest.js';
+                $js[] = $bp.'assets/js/dataviz/plotly-locale-'.$locale.'.js';
             }
             $datavizConfig = array(
                 'url' => jUrl::get('dataviz~service:index', array('repository' => $event->repository, 'project' => $event->project)),

diff --git a/lizmap/modules/dataviz/controllers/service.classic.php b/lizmap/modules/dataviz/controllers/service.classic.php
@@ -350,8 +350,8 @@ protected function GetPlot()
         $basePath = jApp::config()->urlengine['basePath'];
         $locale = substr(jApp::config()->locale, 0, 2);
         $plot['plotly'] = array(
-            'script' => $basePath.'assets/js/dataviz/plotly-latest.min.js',
-            'locale' => $basePath.'assets/js/dataviz/plotly-locale-'.$locale.'-latest.js',
+            'script' => $basePath.'assets/js/dataviz/plotly-custom.min.js',
+            'locale' => $basePath.'assets/js/dataviz/plotly-locale-'.$locale.'.js',
         );
 
         $rep->data = $plot;

diff --git a/lizmap/www/assets/js/dataviz/plotly-custom.min.js b/lizmap/www/assets/js/dataviz/plotly-custom.min.js
diff --git a/lizmap/www/assets/js/dataviz/plotly-latest.min.js b/lizmap/www/assets/js/dataviz/plotly-latest.min.js
diff --git a/lizmap/www/assets/js/dataviz/plotly-locale-de-latest.js b/lizmap/www/assets/js/dataviz/plotly-locale-de-latest.js
diff --git a/lizmap/www/assets/js/dataviz/plotly-locale-de.js b/lizmap/www/assets/js/dataviz/plotly-locale-de.js
diff --git a/...ets/js/dataviz/plotly-locale-el-latest.js → ...www/assets/js/dataviz/plotly-locale-el.js b/...ets/js/dataviz/plotly-locale-el-latest.js → ...www/assets/js/dataviz/plotly-locale-el.js
diff --git a/lizmap/www/assets/js/dataviz/plotly-locale-es-latest.js b/lizmap/www/assets/js/dataviz/plotly-locale-es-latest.js
diff --git a/lizmap/www/assets/js/dataviz/plotly-locale-es.js b/lizmap/www/assets/js/dataviz/plotly-locale-es.js
diff --git a/lizmap/www/assets/js/dataviz/plotly-locale-fr-latest.js b/lizmap/www/assets/js/dataviz/plotly-locale-fr-latest.js