mobility-toolbox-js 2.0.0-beta.41 → 2.0.0-beta.42

package/common/layers/Layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../../src/common/layers/Layer.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;GAiBG;AACH;IACE;;;;;;;;;;;;OAYG;IACH;QAT4B,GAAG;QACH,IAAI;QACF,UAAU;QACN,QAAQ;QACb,OAAO;QACP,QAAQ;QACT,YAAY;QACZ,UAAU;OA+BrC;IAvBC,iBAAuE;IAEvE,WAA0B;IAE1B,iCAAoC;IAEpC,8BAAgC;IAmBlC;;;;OAIG;IACH,qCA0HC;IAED;;;;OAIG;IACH,4BAUC;IARC,cAAc;IACd,SAAc;IAShB;;OAEG;IAEH,sBAGC;IAED;;;;;;;OAOG;IAEH,qDAJW,MAAM,GACL,QAAQ,WAAW,CAAC,CAiB/B;IAED;;OAEG;IACH,cAEC;CACF"}
+{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../../src/common/layers/Layer.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;GAiBG;AACH;IACE;;;;;;;;;;;;OAYG;IACH;QAT4B,GAAG;QACH,IAAI;QACF,UAAU;QACN,QAAQ;QACb,OAAO;QACP,QAAQ;QACT,YAAY;QACZ,UAAU;OA+BrC;IAvBC,iBAAuE;IAEvE,WAA0B;IAE1B,iCAAoC;IAEpC,8BAAgC;IAmBlC;;;;OAIG;IACH,qCAiJC;IAED;;;;OAIG;IACH,4BAUC;IARC,cAAc;IACd,SAAc;IAShB;;OAEG;IAEH,sBAGC;IAED;;;;;;;OAOG;IAEH,qDAJW,MAAM,GACL,QAAQ,WAAW,CAAC,CAiB/B;IAED;;OAEG;IACH,cAEC;CACF"}

package/common/layers/Layer.js

@@ -103,14 +103,25 @@ export default class Layer extends BaseObject {
                     }
                     this.set('visible', newVisible);
                     if (this.visible) {
-                        if (this.parent && !this.parent.visible) {
+                        // We make the parent visible
+                        if (this.parent) {
                             this.parent.visible = true;
                         }
-                        if (this.children && this.children.find((child) => child.group)) {
-                            const child = this.children.find((childd) => !!childd.group);
-                            // Make visible only radioGroup layers
+                        // If children contains layers with group, we display one of them (the last added).
+                        if (this.children && this.children.some((child) => !!child.group)) {
+                            const child = this.children
+                                .reverse()
+                                .find((childd) => !!childd.group);
                             child.visible = true;
                         }
+                        // If children doesn't contain any visible layers (not using group), we display all children (not using group).
+                        if (this.children &&
+                            !this.children.some((child) => !child.group && child.visible)) {
+                            this.children.forEach((child) => {
+                                // eslint-disable-next-line no-param-reassign
+                                child.visible = true;
+                            });
+                        }
                         // Warn the same group that a new layer is visible
                         if (this.parent && this.group) {
                             // We search for the higher parent then it will dispatch to all the tree.
@@ -125,6 +136,14 @@ export default class Layer extends BaseObject {
                         }
                     }
                     else if (!this.visible) {
+                        // We hide all the children
+                        if (this.children) {
+                            this.children.forEach((child) => {
+                                // eslint-disable-next-line no-param-reassign
+                                child.visible = false;
+                            });
+                        }
+                        // If the parent has no more visible child we also hide it.
                         if (this.parent &&
                             this.parent.visible &&
                             !this.parent.children.find((child) => child.visible)) {

package/mbt.js

@@ -47845,13 +47845,18 @@ uniform ${i3} ${o3} u_${a3};
             }
             this.set("visible", newVisible);
             if (this.visible) {
-              if (this.parent && !this.parent.visible) {
+              if (this.parent) {
                 this.parent.visible = true;
               }
-              if (this.children && this.children.find((child) => child.group)) {
-                const child = this.children.find((childd) => !!childd.group);
+              if (this.children && this.children.some((child) => !!child.group)) {
+                const child = this.children.reverse().find((childd) => !!childd.group);
                 child.visible = true;
               }
+              if (this.children && !this.children.some((child) => !child.group && child.visible)) {
+                this.children.forEach((child) => {
+                  child.visible = true;
+                });
+              }
               if (this.parent && this.group) {
                 let higherParent = this.parent;
                 while (higherParent.parent) {
@@ -47863,6 +47868,11 @@ uniform ${i3} ${o3} u_${a3};
                 });
               }
             } else if (!this.visible) {
+              if (this.children) {
+                this.children.forEach((child) => {
+                  child.visible = false;
+                });
+              }
               if (this.parent && this.parent.visible && !this.parent.children.find((child) => child.visible)) {
                 this.parent.visible = false;
               }