mobility-toolbox-js 2.0.0-beta.39 → 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/common/mixins/UserInteractionsLayerMixin.d.ts

@@ -18,17 +18,25 @@ export class UserInteractionsLayerInterface {
      */
     activateUserInteractions(): void;
     /**
-     * Deactivaet map listeners events.
+     * Deactivate map listeners events.
      */
     deactivateUserInteractions(): void;
     /**
-     * Terminate the layer unsubscribing user interactions.
+     * Subscribe on user:click event.
      */
     onClick(callback: any): void;
     /**
-     * Terminate the layer unsubscribing user interactions.
+     * Subscribe on user:hover event.
      */
     onHover(callback: any): void;
+    /**
+     * Unsubscribe on user:click event.
+     */
+    unClick(callback: any): void;
+    /**
+     * Unsubscribe on user:hover event.
+     */
+    unHover(callback: any): void;
 }
 export default UserInteractionsLayerMixin;
 /**

package/common/mixins/UserInteractionsLayerMixin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserInteractionsLayerMixin.d.ts","sourceRoot":"","sources":["../../../src/common/mixins/UserInteractionsLayerMixin.js"],"names":[],"mappings":"AAQA;;GAEG;AACH;IAUE,0BAA4B;IAE5B;;;;OAIG;IACH,4BAAmB;IAEnB;;OAEG;IACH,sBAAkB;IAElB;;OAEG;IACH,iCAA6B;IAE7B;;OAEG;IACH,mCAA+B;IAE/B;;OAEG;IACH,6BAAoB;IAEpB;;OAEG;IACH,6BAAoB;CACrB;;AAED;;;;;;GAMG;AACH,gEA6KG"}
+{"version":3,"file":"UserInteractionsLayerMixin.d.ts","sourceRoot":"","sources":["../../../src/common/mixins/UserInteractionsLayerMixin.js"],"names":[],"mappings":"AAQA;;GAEG;AACH;IAUE,0BAA4B;IAE5B;;;;OAIG;IACH,4BAAmB;IAEnB;;OAEG;IACH,sBAAkB;IAElB;;OAEG;IACH,iCAA6B;IAE7B;;OAEG;IACH,mCAA+B;IAE/B;;OAEG;IACH,6BAAoB;IAEpB;;OAEG;IACH,6BAAoB;IAEpB;;OAEG;IACH,6BAAoB;IAEpB;;OAEG;IACH,6BAAoB;CACrB;;AAED;;;;;;GAMG;AACH,gEAkNG"}

package/common/mixins/UserInteractionsLayerMixin.js

@@ -34,17 +34,25 @@ export class UserInteractionsLayerInterface {
      */
     activateUserInteractions() { }
     /**
-     * Deactivaet map listeners events.
+     * Deactivate map listeners events.
      */
     deactivateUserInteractions() { }
     /**
-     * Terminate the layer unsubscribing user interactions.
+     * Subscribe on user:click event.
      */
     onClick(callback) { }
     /**
-     * Terminate the layer unsubscribing user interactions.
+     * Subscribe on user:hover event.
      */
     onHover(callback) { }
+    /**
+     * Unsubscribe on user:click event.
+     */
+    unClick(callback) { }
+    /**
+     * Unsubscribe on user:hover event.
+     */
+    unHover(callback) { }
 }
 /**
  * Mixin for UserInteractionsLayerInterface. It provide onClick and onHover functions.
@@ -142,6 +150,39 @@ const UserInteractionsLayerMixin = (Base) => class extends Base {
             this.listenEvents();
         }
     }
+    /**
+     * Unlistens to click events on the layer.
+     * @param {function} callback Callback function, called with the clicked
+     *   features,
+     *   the layer instance and the click event.
+     */
+    unClick(callback) {
+        const index = this.userClickCallbacks.indexOf(callback);
+        if (index !== -1) {
+            return;
+        }
+        this.userClickCallbacks = this.userClickCallbacks.slice(index, 1);
+        if (this.map) {
+            // If the layer is already attached to the map we reload the events
+            this.listenEvents();
+        }
+    }
+    /**
+     * Unlistens to hover events on the layer.
+     * @param {function} callback Callback function, called with the clicked
+     *   features, the layer instance and the click event.
+     */
+    unHover(callback) {
+        const index = this.userHoverCallbacks.indexOf(callback);
+        if (index !== -1) {
+            return;
+        }
+        this.userHoverCallbacks = this.userHoverCallbacks.slice(index, 1);
+        if (this.map) {
+            // If the layer is already attached to the map we reload the events
+            this.listenEvents();
+        }
+    }
     /**
      * Function triggered when the user click the map.
      * @private

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;
               }
@@ -48002,6 +48012,26 @@ uniform ${i3} ${o3} u_${a3};
         this.listenEvents();
       }
     }
+    unClick(callback) {
+      const index = this.userClickCallbacks.indexOf(callback);
+      if (index !== -1) {
+        return;
+      }
+      this.userClickCallbacks = this.userClickCallbacks.slice(index, 1);
+      if (this.map) {
+        this.listenEvents();
+      }
+    }
+    unHover(callback) {
+      const index = this.userHoverCallbacks.indexOf(callback);
+      if (index !== -1) {
+        return;
+      }
+      this.userHoverCallbacks = this.userHoverCallbacks.slice(index, 1);
+      if (this.map) {
+        this.listenEvents();
+      }
+    }
     onUserClickCallback(evt) {
       const coordinate = evt.coordinate || fromLonLat(evt.lngLat.toArray());
       const emptyFeatureInfo = {
@@ -49601,8 +49631,8 @@ uniform ${i3} ${o3} u_${a3};
     attachToMap(map) {
       super.attachToMap(map);
       if (this.map) {
-        this.olListenersKeys.push(this.map.on(["moveend", "change:target"], (evt) => {
-          const view = this.map.getView();
+        this.olListenersKeys.push(...this.map.on(["moveend", "change:target"], (evt) => {
+          const view = evt.map.getView();
           if (view.getAnimating() || view.getInteracting()) {
             return;
           }
@@ -49628,6 +49658,9 @@ uniform ${i3} ${o3} u_${a3};
       return false;
     }
     renderTrajectories(noInterpolate) {
+      if (!this.map) {
+        return;
+      }
       const view = this.map.getView();
       super.renderTrajectories({
         size: this.map.getSize(),