Fix change signature olms

IGNF · Nov 13, 2024 · fc7ccce · fc7ccce
1 parent dc0f652
commit fc7ccce
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 7 deletions.
diff --git a/samples-src/pages/tests/Catalog/pages-ol-catalog-modules-categories-3.html b/samples-src/pages/tests/Catalog/pages-ol-catalog-modules-categories-3.html
@@ -84,6 +84,14 @@ <h2>Ajout du gestionnaire de catalogue avec options sur les categories</h2>
                                     field : "service",
                                     value : "TMS"
                                 }
+                            },
+                            {
+                                title : "WFS",
+                                default : false,
+                                filter : {
+                                    field : "service",
+                                    value : "WFS"
+                                }
                             }
                         ],
                     });

diff --git a/samples-src/pages/tests/Catalog/pages-ol-catalog-modules-dsfr-categories-3.html b/samples-src/pages/tests/Catalog/pages-ol-catalog-modules-dsfr-categories-3.html
@@ -84,6 +84,14 @@ <h2>Ajout du gestionnaire de catalogue avec options sur les categories</h2>
                                     field : "service",
                                     value : "TMS"
                                 }
+                            },
+                            {
+                                title : "WFS",
+                                default : false,
+                                filter : {
+                                    field : "service",
+                                    value : "WFS"
+                                }
                             }
                         ],
                     });

diff --git a/samples-src/pages/tests/Layers/pages-ol-layermapbox-modules-editor.html b/samples-src/pages/tests/Layers/pages-ol-layermapbox-modules-editor.html
@@ -78,9 +78,25 @@ <h2>Ajout d'une couche MapBox</h2>
                                 break;
                             }
                         }
-                        return olms.applyStyle(layer, style, source);
+                        return olms.applyStyle(layer, style, { source: source });
                     }
 
+                    function updateLegendMapBoxLayer (layer, source, options) {
+                        console.error(layer, source, options);
+
+                        var layers = style.layers;
+                        for (var i = 0; i < layers.length; i++) {
+                            if (layers[i].id === options.data.id) {
+                                var paint = layers[i].paint;
+                                if (paint) {
+                                    paint[options.dataset] = options.value;
+                                }
+                                break;
+                            }
+                        }
+                        return olms.applyStyle(layer, style, { source: source });
+                    }
+
                     // edition des filtres
                     function displayEditor() {
                         waiting(true);
@@ -121,7 +137,20 @@ <h2>Ajout d'une couche MapBox</h2>
                                     },
                                     "editor:legend:onchangevalue" : function (e) {
                                         // opacité, epaisseur et couleur
-                                        console.log(e);
+                                        var data = e.target.data.obj;
+                                        var target = e.target.srcElement;
+
+                                        updateLegendMapBoxLayer(layer, "plan_ign", {
+                                            data:data,
+                                            value:target.value,
+                                            dataset: target.dataset.id
+                                        })
+                                        .then(function () {
+                                            // some stuff...
+                                        })
+                                        .catch(function (error) {
+                                            console.error("[ERROR]", error);
+                                        });
                                     },
                                     "editor:style:scale:onchangemax" : function (e) {console.log(e);},
                                     "editor:style:scale:onchangemin" : function (e) {console.log(e);}

diff --git a/src/packages/Controls/LayerImport/LayerImport.js b/src/packages/Controls/LayerImport/LayerImport.js
@@ -1439,7 +1439,7 @@ var LayerImport = class LayerImport extends Control {
                         // TODO ajouter le style de type background !
                         // fonction de style de la couche
                         var setStyle = () => {
-                            applyStyleOlms(p.layer, p.styles, p.id)
+                            applyStyleOlms(p.layer, p.styles, { source : p.id })
                                 .then(function () {
                                     var visibility = true;
                                     p.layer.setVisible(visibility);
@@ -1870,7 +1870,7 @@ var LayerImport = class LayerImport extends Control {
                     break;
                 }
             }
-            applyStyleOlms(layer, styles, data.source)
+            applyStyleOlms(layer, styles, { source : data.source })
                 .then(function () {})
                 .catch(function (error) {
                     logger.error(error);
@@ -1901,7 +1901,7 @@ var LayerImport = class LayerImport extends Control {
                     break;
                 }
             }
-            applyStyleOlms(layer, styles, data.source)
+            applyStyleOlms(layer, styles,  { source : data.source })
                 .then(function () {})
                 .catch(function (error) {
                     logger.error(error);
@@ -1933,7 +1933,7 @@ var LayerImport = class LayerImport extends Control {
                     break;
                 }
             }
-            applyStyleOlms(layer, styles, data.source)
+            applyStyleOlms(layer, styles,  { source : data.source })
                 .then(function () {})
                 .catch(function (error) {
                     logger.error(error);
@@ -1967,7 +1967,7 @@ var LayerImport = class LayerImport extends Control {
                     break;
                 }
             }
-            applyStyleOlms(layer, styles, data.source)
+            applyStyleOlms(layer, styles,  { source : data.source, updateSource : true })
                 .then(function () {})
                 .catch(function (error) {
                     logger.error(error);