Merge pull request #4390 from nboisteault/lazy-load-jsts-buffer

lazy load jsts buffer
3liz · Apr 29, 2024 · f766786 · f766786
2 parents 23c72c9 + 2d41537
commit f766786
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,7 +61,12 @@ lizmap/www/assets/js/timemanager.js
 lizmap/www/assets/js/timemanager.js.map
 lizmap/www/assets/js/view.js
 lizmap/www/assets/js/view.js.map
-
+lizmap/www/assets/js/137.bundle.js
+lizmap/www/assets/js/137.bundle.js.map
+lizmap/www/assets/js/BufferOp.bundle.js
+lizmap/www/assets/js/BufferOp.bundle.js.map
+lizmap/www/assets/js/OLparser.bundle.js
+lizmap/www/assets/js/OLparser.bundle.js.map
 # Docs
 docs/js
 

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -42,6 +42,12 @@ build:
       - lizmap/www/assets/js/timemanager.js.map
       - lizmap/www/assets/js/view.js
       - lizmap/www/assets/js/view.js.map
+      - lizmap/www/assets/js/137.bundle.js
+      - lizmap/www/assets/js/137.bundle.js.map
+      - lizmap/www/assets/js/BufferOp.bundle.js
+      - lizmap/www/assets/js/BufferOp.bundle.js.map
+      - lizmap/www/assets/js/OLparser.bundle.js
+      - lizmap/www/assets/js/OLparser.bundle.js.map
   tags:
     - fabric
 

diff --git a/assets/src/modules/SelectionTool.js b/assets/src/modules/SelectionTool.js
@@ -4,10 +4,7 @@
  * @copyright 2023 3Liz
  * @license MPL-2.0
  */
-import {mainLizmap, mainEventDispatcher} from '../modules/Globals.js';
-
-import BufferOp from 'jsts/org/locationtech/jts/operation/buffer/BufferOp.js';
-import OLparser from 'jsts/org/locationtech/jts/io/OL3Parser.js';
+import { mainLizmap, mainEventDispatcher } from '../modules/Globals.js';
 
 import {
     LinearRing,
@@ -118,29 +115,34 @@ export default class SelectionTool {
                         // Handle buffer if any
                         this._bufferLayer.getSource().clear();
                         if (this._bufferValue > 0) {
-                            const parser = new OLparser();
-                            parser.inject(
-                                Point,
-                                LineString,
-                                LinearRing,
-                                Polygon,
-                                MultiPoint,
-                                MultiLineString,
-                                MultiPolygon
-                            );
+                            Promise.all([
+                                import(/* webpackChunkName: 'OLparser' */ 'jsts/org/locationtech/jts/io/OL3Parser.js'),
+                                import(/* webpackChunkName: 'BufferOp' */ 'jsts/org/locationtech/jts/operation/buffer/BufferOp.js')
+                            ]).then(([{ default: OLparser }, { default: BufferOp }]) => {
+                                const parser = new OLparser();
+                                parser.inject(
+                                    Point,
+                                    LineString,
+                                    LinearRing,
+                                    Polygon,
+                                    MultiPoint,
+                                    MultiLineString,
+                                    MultiPolygon
+                                );
 
-                            // Convert the OpenLayers geometry to a JSTS geometry
-                            const jstsGeom = parser.read(selectionFeature.getGeometry());
+                                // Convert the OpenLayers geometry to a JSTS geometry
+                                const jstsGeom = parser.read(selectionFeature.getGeometry());
 
-                            // Create a buffer
-                            const jstsbBufferedGeom = BufferOp.bufferOp(jstsGeom, this._bufferValue);
+                                // Create a buffer
+                                const jstsbBufferedGeom = BufferOp.bufferOp(jstsGeom, this._bufferValue);
 
-                            const bufferedFeature = new Feature();
-                            bufferedFeature.setGeometry(parser.write(jstsbBufferedGeom));
+                                const bufferedFeature = new Feature();
+                                bufferedFeature.setGeometry(parser.write(jstsbBufferedGeom));
 
-                            this._bufferLayer.getSource().addFeature(bufferedFeature);
+                                this._bufferLayer.getSource().addFeature(bufferedFeature);
 
-                            selectionFeature = this.featureDrawnBuffered;
+                                selectionFeature = this.featureDrawnBuffered;
+                            });
                         }
 
                         for (const featureType of this.allFeatureTypeSelected) {

diff --git a/assets/webpack.common.js b/assets/webpack.common.js
@@ -17,9 +17,10 @@ export default {
         'bottom-dock': './src/legacy/bottom-dock.js',
     },
     output: {
-        filename: '../../lizmap/www/assets/js/[name].js',
+        filename: '[name].js',
         chunkFilename: '[name].bundle.js',
-        path: resolve(__dirname, 'dist')
+        publicPath: '/assets/js/',
+        path: resolve(__dirname, '../lizmap/www/assets/js/')
     },
     module: {
         rules: [