mobility-toolbox-js 3.0.0-beta.6 → 3.0.0-beta.8

package/ol/controls/CopyrightControl.js

@@ -26,6 +26,11 @@ class CopyrightControl extends Control {
         const element = createDefaultCopyrightElement();
         element.className = options.className || 'mbt-copyright';
         super(Object.assign({ element }, options));
+        this.format =
+            options.format ||
+                ((copyrights) => {
+                    return copyrights === null || copyrights === void 0 ? void 0 : copyrights.join(' | ');
+                });
     }
     render({ frameState }) {
         if (!frameState) {
@@ -35,18 +40,23 @@ class CopyrightControl extends Control {
         let copyrights = [];
         // This code loop comes mainly from ol.
         frameState === null || frameState === void 0 ? void 0 : frameState.layerStatesArray.forEach((layerState) => {
+            var _a;
             const { layer } = layerState;
-            if (frameState &&
-                inView(layerState, frameState.viewState) &&
-                layer &&
-                layer.getSource &&
-                layer.getSource() &&
-                layer.getSource().getAttributions()) {
-                copyrights = copyrights.concat(layer.getSource().getAttributions()(frameState));
+            if (frameState && inView(layerState, frameState.viewState)) {
+                if ((_a = layer === null || layer === void 0 ? void 0 : layer.getSource()) === null || _a === void 0 ? void 0 : _a.getAttributions()) {
+                    copyrights = copyrights.concat(layer.getSource().getAttributions()(frameState));
+                }
+                if (layer === null || layer === void 0 ? void 0 : layer.get('copyrights')) {
+                    let copyProp = layer.get('copyrights');
+                    copyProp = !Array.isArray(copyProp) ? [copyProp] : copyProp;
+                    if (copyProp === null || copyProp === void 0 ? void 0 : copyProp.length) {
+                        copyrights.push(...copyProp);
+                    }
+                }
             }
         });
         const unique = removeDuplicate(copyrights) || [];
-        this.element.innerHTML = unique.join(' | ');
+        this.element.innerHTML = this.format(unique);
     }
 }
 export default CopyrightControl;

package/ol/controls/RoutingControl.js

@@ -114,6 +114,9 @@ class RoutingControl extends Control {
         this.segments = [];
         this.format = new GeoJSON({ featureProjection: 'EPSG:3857' });
         this.initialRouteDrag = {};
+        if (!this.element) {
+            this.createDefaultElement();
+        }
         /** True if the control is requesting the backend. */
         this.loading = false;
         /** @private */

package/ol/controls/StopFinderControl.js

@@ -39,5 +39,8 @@ class StopFinderControl extends Control {
         const coord = fromLonLat(suggestion.geometry.coordinates);
         (_a = this.getMap()) === null || _a === void 0 ? void 0 : _a.getView().setCenter(coord);
     }
+    search(q, abortController) {
+        return this.controller.search(q, abortController);
+    }
 }
 export default StopFinderControl;

package/ol/layers/RealtimeLayer.js

@@ -11,7 +11,7 @@ import RealtimeLayerRenderer from '../renderers/RealtimeLayerRenderer';
 /** @private */
 const format = new GeoJSON();
 /**
- * Responsible for loading and display data from the geOps Realtime API.
+ * Responsible for loading and display data from the geOps realtime API.
  *
  * @example
  * import { RealtimeLayer } from 'mobility-toolbox-js/ol';
@@ -38,7 +38,7 @@ class RealtimeLayer extends RealtimeLayerMixin(MobilityLayerMixin(Layer)) {
      * @param {RealtimeLayerOptions} options
      * @param {boolean} [options.allowRenderWhenAnimating=false] Allow rendering of the layer when the map is animating.
      * @param {string} options.apiKey Access key for [geOps apis](https://developer.geops.io/).
-     * @param {string} [options.url="wss://api.geops.io/tracker-ws/v1/"] The geOps Realtime API url.
+     * @param {string} [options.url="wss://api.geops.io/tracker-ws/v1/"] The geOps realtime API url.
      *
      */
     constructor(options) {

package/ol/mixins/PropertiesLayerMixin.js

@@ -1,4 +1,3 @@
-import BaseEvent from 'ol/events/Event';
 import { getUid } from 'ol';
 import getLayersAsFlatArray from '../../common/utils/getLayersAsFlatArray';
 /**
@@ -87,25 +86,6 @@ function PropertiesLayerMixin(Base) {
                 if (evt.key === 'children') {
                     this.onChildrenChange(evt.oldValue);
                 }
-            }), 
-            // Manage group visiblity
-            this.on('change:visible', () => {
-                this.onVisibleChange();
-            }), 
-            // Listen for group visiblity change
-            // if a layer from a group is newly visible we hide the others.
-            // @ts-ignore
-            this.on(`change:visible:group`, (evt) => {
-                // We hide layer of the same group
-                if (this.group === evt.target.group &&
-                    this !== evt.target &&
-                    this.visible) {
-                    this.visible = false;
-                    // Propagate event to parent
-                }
-                else if (this.children) {
-                    this.children.forEach((child) => child.dispatchEvent(evt));
-                }
             }));
             this.options = options;
             this.children = options.children || []; // Trigger the on children change event
@@ -129,46 +109,6 @@ function PropertiesLayerMixin(Base) {
                 child.set('parent', this);
             });
         }
-        /** @private */
-        onVisibleChange() {
-            const parent = this.get('parent');
-            const children = this.get('children') || [];
-            if (this.getVisible()) {
-                const group = this.get('group');
-                // We make the parent visible
-                if (parent) {
-                    parent.setVisible(true);
-                }
-                // If children doesn't contain any visible layers, we display all children.
-                if (children && !children.some((child) => child.getVisible())) {
-                    children.forEach((child) => {
-                        child.setVisible(true);
-                    });
-                }
-                // Warn the same group that a new layer is visible
-                if (parent && group) {
-                    // We search for the higher parent then it will dispatch to all the tree.
-                    let higherParent = parent;
-                    while (higherParent.get('parent')) {
-                        higherParent = higherParent.get('parent');
-                    }
-                    const evt = new BaseEvent(`change:visible:group`);
-                    evt.target = this;
-                    higherParent.dispatchEvent(evt);
-                }
-            }
-            else {
-                // We hide all the children
-                children.forEach((child) => {
-                    child.setVisible(false);
-                });
-                // If the parent has no more visible child we also hide it.
-                if ((parent === null || parent === void 0 ? void 0 : parent.getVisible()) &&
-                    !(parent === null || parent === void 0 ? void 0 : parent.get('children').find((child) => child.getVisible()))) {
-                    parent.setVisible(false);
-                }
-            }
-        }
         /**
          * Initialize the layer with the map passed in parameters.
          *

package/ol/utils/getFeatureInfoAtCoordinate.js

@@ -63,7 +63,7 @@ const getFeatureInfoAtCoordinate = (coordinate, layers, hitTolerance = 5) => __a
         const source = layer === null || layer === void 0 ? void 0 : layer.getSource();
         // @ts-ignore
         if (source === null || source === void 0 ? void 0 : source.getFeatureInfoUrl) {
-            const id = getUid(this);
+            const id = getUid(layer);
             // Abort and recreates one controller per layer
             (_c = abortControllers[id]) === null || _c === void 0 ? void 0 : _c.abort();
             abortControllers[id] = new AbortController();

package/package.json

@@ -2,7 +2,7 @@
   "name": "mobility-toolbox-js",
   "license": "MIT",
   "description": "Toolbox for JavaScript applications in the domains of mobility and logistics.",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.8",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "module": "index.js",
   "exports": {