Merge branch 'develop' into feature/clean-default-url

IGNF · Mar 17, 2024 · 478aae1 · 478aae1
2 parents 90b707c + c2fbe2b
commit 478aae1
Show file tree

Hide file tree

Showing 13 changed files with 32,826 additions and 25,787 deletions.
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -5,6 +5,9 @@
 
 ## Summary
 
+* divers correctifs sur le build par modules
+* MaJ des fichiers de styles MapBox (conformes au spec)
+
 ## Changelog
 
 * [Added]
@@ -23,15 +26,6 @@
 
 ---
 
-
-
-
-
-
-
-
-
-
 # Extension Geoportail Leaflet, version __VERSION__
 
 **__DATE__**
@@ -58,13 +52,6 @@ Ajout possible de couches à accès restreint via une fichier de configuration c
 ---
 
 
-
-
-
-
-
-
-
 # Extension Geoportail Itowns, version __VERSION__
 
 **__DATE__**

diff --git a/build/webpack/webpack.config.openlayers.modules.js b/build/webpack/webpack.config.openlayers.modules.js
@@ -99,32 +99,44 @@ module.exports = (env, argv) => {
                 if (/^ol\/.+$/.test(request)) {
                     // liste des modules ES6 à garder dans le code...
                     if ([
-                        "ol/events/Event",
                         "ol/events/EventType",
+                        "ol/events/EventType.js",
                         "ol/events",
-                        "ol/obj",
-                        "ol/render/canvas",
-                        "ol/css",
-                        "ol/dom",
-                        "ol/transform",
-                        "ol/asserts",
-                        "ol/AssertionError",
-                        "ol/util",
-                        "ol/render/canvas/LabelCache",
-                        "ol/structs/LRUCache",
-                        "ol/events/Target",
-                        "ol/Disposable",
-                        "ol/functions",
-                        "ol/proj/transforms"
+                        "ol/events.js",
+                        "ol/render/Feature",
+                        "ol/render/Feature.js",
+                        // "ol/obj",
+                        // "ol/css",
+                        // "ol/dom",
+                        // "ol/transform",
+                        // "ol/asserts",
+                        // "ol/AssertionError",
+                        // "ol/util",
+                        // "ol/render/canvas/LabelCache", <!-- depreciate -->
+                        // "ol/structs/LRUCache",
+                        // "ol/events/Event",
+                        // "ol/events/Target",
+                        // "ol/Disposable",
+                        // "ol/functions",
+                        // "ol/proj/transforms"
                     ].includes(request)) {
-                        // console.log("#### IN : ", request);
+                        if (devMode) {
+                            console.log("#### MODULE ES6 ONLY : " + request + " (" + context + ")");
+                        }
                         return callback();
                     }
-                    // console.log("#### OUT : ", request);
-                    const replacedWith = request.replace(/\//g, '.');
+                    if (devMode) {
+                        console.log("#### OL : " + request + " (" + context + ")");
+                    }
+                    const replacedWith = request.replace(/\.js$/g, '').replace(/\//g, '.');
+                    if (devMode) {
+                        console.log(">>> : ", replacedWith);
+                    }
                     return callback(null, replacedWith);
                 }
-                // console.log("#### NULL : ", request);
+                if (devMode) {
+                    console.log("#### OTHER : " + request + " (" + context + ")");
+                }
                 callback();
             },
             /**

diff --git a/jsdoc.1689959507162.conf.tmp b/jsdoc.1689959507162.conf.tmp
diff --git a/samples-src/pages/openlayers/Editor/pages-ol-editor-modules-test.html b/samples-src/pages/openlayers/Editor/pages-ol-editor-modules-test.html
@@ -50,7 +50,22 @@ <h2>Ajout du widget d'édition des themes MapBox</h2>
                     legend : true
                 }
             });
-
+            // create DOM
+            editor0.createElement()
+            .then(() => {
+                console.warn({
+                    "id": editor0.getID(),
+                    "container": editor0.getContainer(),
+                    "style": editor0.getStyle(),
+                    "layers": editor0.getLayers(),
+                    "style layer 0": editor0.getStyleLayer(0),
+                    "layer 0 from style": editor0.getLayerFromStyle(0),
+                    "layer 0": editor0.getLayer(0)
+                });
+            })
+            .catch(error => {
+                console.error(error);
+            });
             // liste de themes reussi avec imagette !
             var editor1 = new ol.style.Editor({
                 target: document.getElementById("editor"),
@@ -103,6 +118,22 @@ <h2>Ajout du widget d'édition des themes MapBox</h2>
                     group : true
                 }
             });
+            // create DOM
+            editor1.createElement()
+            .then(() => {
+                console.warn({
+                    "id": editor1.getID(),
+                    "container": editor1.getContainer(),
+                    "style": editor1.getStyle(),
+                    "layers": editor1.getLayers(),
+                    "style layer 0": editor1.getStyleLayer(0),
+                    "layer 0 from style": editor1.getLayerFromStyle(0),
+                    "layer 0": editor1.getLayer(0)
+                });
+            })
+            .catch(error => {
+                console.error(error);
+            });
 
             var editor2 = new ol.style.Editor({
                 target: document.getElementById("editor"),
@@ -121,6 +152,22 @@ <h2>Ajout du widget d'édition des themes MapBox</h2>
                     group : true
                 }
             });
+            // create DOM
+            editor2.createElement()
+            .then(() => {
+                console.warn({
+                    "id": editor2.getID(),
+                    "container": editor2.getContainer(),
+                    "style": editor2.getStyle(),
+                    "layers": editor2.getLayers(),
+                    "style layer 0": editor2.getStyleLayer(0),
+                    "layer 0 from style": editor2.getLayerFromStyle(0),
+                    "layer 0": editor2.getLayer(0)
+                });
+            })
+            .catch(error => {
+                console.error(error);
+            });
 
             document.getElementById("displayTrue").addEventListener("click", function () {
                 editor1.display(true);