mobility-toolbox-js 2.0.0-beta.52 → 2.0.0-beta.53

package/ol/controls/RoutingControl.js

@@ -7,6 +7,7 @@ import { GeoJSON } from 'ol/format';
 import { buffer } from 'ol/extent';
 import { fromLonLat, toLonLat } from 'ol/proj';
 import GeomType from 'ol/geom/GeometryType';
+import BaseEvent from 'ol/events/Event';
 import { RoutingAPI } from '../../api';
 import ControlCommon from '../../common/controls/ControlCommon';
 import RoutingLayer from '../layers/RoutingLayer';
@@ -36,7 +37,12 @@ const STOP_FETCH_ABORT_CONTROLLER_KEY = 'stop-fetch';
 const getFlatCoordinatesFromSegments = (segmentArray) => {
     const coords = [];
     segmentArray.forEach((seg) => {
-        coords.push(...seg.getGeometry().getCoordinates());
+        var _a;
+        // @ts-ignore
+        const coordArr = (_a = seg.getGeometry()) === null || _a === void 0 ? void 0 : _a.getCoordinates();
+        if (coordArr === null || coordArr === void 0 ? void 0 : coordArr.length) {
+            coords.push(...coordArr);
+        }
     });
     return coords;
 };
@@ -74,6 +80,17 @@ const getFlatCoordinatesFromSegments = (segmentArray) => {
 class RoutingControl extends ControlCommon {
     constructor(options = {}) {
         super(options);
+        this.viaPoints = [];
+        this.loading = false;
+        this.graphs = [];
+        this.modify = true;
+        this.useRawViaPoints = false;
+        this.snapToClosestStation = false;
+        this.cacheStationData = {};
+        this.abortControllers = {};
+        this.segments = [];
+        this.format = new GeoJSON({ featureProjection: 'EPSG:3857' });
+        this.initialRouteDrag = {};
         Object.defineProperties(this, {
             mot: {
                 get: () => this.get('mot'),
@@ -108,22 +125,16 @@ class RoutingControl extends ControlCommon {
         /** @ignore */
         this.modify = options.modify !== false;
         /** @ignore */
-        this.routingApiParams = options.routingApiParams || {};
+        this.routingApiParams = options.routingApiParams;
         /** @ignore */
         this.useRawViaPoints = options.useRawViaPoints || false;
         /** @ignore */
         this.snapToClosestStation = options.snapToClosestStation || false;
         /** @ignore */
-        this.cacheStationData = {};
-        /** @ignore */
-        this.abortControllers = [];
-        /** @ignore */
         this.apiKey = options.apiKey;
         /** @ignore */
         this.stopsApiKey = options.stopsApiKey || this.apiKey;
         /** @ignore */
-        this.segments = [];
-        /** @ignore */
         this.stopsApiUrl = options.stopsApiUrl || 'https://api.geops.io/stops/v1/';
         /** @ignore */
         this.api = new RoutingAPI(Object.assign({}, options));
@@ -138,25 +149,18 @@ class RoutingControl extends ControlCommon {
         this.onRouteError =
             options.onRouteError ||
                 ((error) => {
-                    this.dispatchEvent({
-                        type: 'change:route',
-                        target: this,
-                    });
+                    this.dispatchEvent(new BaseEvent('change:route'));
                     this.reset();
                     // eslint-disable-next-line no-console
                     console.error(error);
                 });
         /** @ignore */
-        this.viaPoints = [];
-        /** @ignore */
         this.onMapClick = this.onMapClick.bind(this);
         /** @ignore */
         this.onModifyEnd = this.onModifyEnd.bind(this);
         /** @ignore */
         this.onModifyStart = this.onModifyStart.bind(this);
         /** @ignore */
-        this.apiChangeListener = () => this.drawRoute();
-        /** @ignore */
         this.createModifyInteraction();
     }
     /**
@@ -185,26 +189,20 @@ class RoutingControl extends ControlCommon {
         /* Add/Insert/Overwrite viapoint and redraw route */
         this.viaPoints.splice(index === -1 ? this.viaPoints.length : index, overwrite, coordinatesOrString);
         this.drawRoute();
-        this.dispatchEvent({
-            type: 'change:route',
-            target: this,
-        });
+        this.dispatchEvent(new BaseEvent('change:route'));
     }
     /**
      * Removes a viaPoint at the passed array index and redraws route
      * By default the last viaPoint is removed.
      * @param {number} index Integer representing the index of the viaPoint to delete.
      */
-    removeViaPoint(index = this.viaPoints.length - 1) {
+    removeViaPoint(index = (this.viaPoints || []).length - 1) {
         /* Remove viapoint and redraw route */
         if (this.viaPoints.length && this.viaPoints[index]) {
             this.viaPoints.splice(index, 1);
         }
         this.drawRoute();
-        this.dispatchEvent({
-            type: 'change:route',
-            target: this,
-        });
+        this.dispatchEvent(new BaseEvent('change:route'));
     }
     /**
      * Replaces the current viaPoints with a new coordinate array.
@@ -213,23 +211,18 @@ class RoutingControl extends ControlCommon {
     setViaPoints(coordinateArray) {
         this.viaPoints = [...coordinateArray];
         this.drawRoute();
-        this.dispatchEvent({
-            type: 'change:route',
-            target: this,
-        });
+        this.dispatchEvent(new BaseEvent('change:route'));
     }
     /**
      * Removes all viaPoints, clears the source and triggers a change event
      */
     reset() {
+        var _a, _b, _c;
         // Clear viaPoints and source
         this.abortRequests();
         this.viaPoints = [];
-        this.routingLayer.olLayer.getSource().clear();
-        this.dispatchEvent({
-            type: 'change:route',
-            target: this,
-        });
+        (_c = (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.olLayer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.clear();
+        this.dispatchEvent(new BaseEvent('change:route'));
     }
     /**
      * Aborts viapoint and route requests
@@ -238,11 +231,12 @@ class RoutingControl extends ControlCommon {
     abortRequests() {
         var _a;
         // Abort Routing API requests
-        this.graphs.forEach(([graph]) => {
-            if (this.abortControllers[graph]) {
-                this.abortControllers[graph].abort();
+        this.graphs.forEach((graph) => {
+            const graphName = graph[0];
+            if (this.abortControllers[graphName]) {
+                this.abortControllers[graphName].abort();
             }
-            this.abortControllers[graph] = new AbortController();
+            this.abortControllers[graphName] = new AbortController();
         });
         // Abort Stops API requests
         (_a = this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY]) === null || _a === void 0 ? void 0 : _a.abort();
@@ -258,9 +252,10 @@ class RoutingControl extends ControlCommon {
      * @private
      */
     drawRoute() {
+        var _a, _b, _c, _d, _e, _f;
         /* Calls RoutingAPI to draw a route using the viaPoints array */
         this.abortRequests();
-        this.routingLayer.olLayer.getSource().clear();
+        (_c = (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.olLayer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.clear();
         if (!this.viaPoints.length) {
             return null;
         }
@@ -269,8 +264,9 @@ class RoutingControl extends ControlCommon {
             return this.drawViaPoint(this.viaPoints[0], 0, this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY]);
         }
         const formattedViaPoints = this.viaPoints.map((viaPoint) => {
+            var _a;
             if (Array.isArray(viaPoint)) {
-                const projection = this.map.getView().getProjection();
+                const projection = (_a = this.map) === null || _a === void 0 ? void 0 : _a.getView().getProjection();
                 // viaPoint is a coordinate
                 // Coordinates need to be reversed as required by the backend RoutingAPI
                 const [lon, lat] = toLonLat(viaPoint, projection);
@@ -281,14 +277,20 @@ class RoutingControl extends ControlCommon {
         });
         this.loading = true;
         // Clear source
-        this.routingLayer.olLayer.getSource().clear();
+        (_f = (_e = (_d = this.routingLayer) === null || _d === void 0 ? void 0 : _d.olLayer) === null || _e === void 0 ? void 0 : _e.getSource()) === null || _f === void 0 ? void 0 : _f.clear();
         // Create point features for the viaPoints
         this.viaPoints.forEach((viaPoint, idx) => this.drawViaPoint(viaPoint, idx, this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY]));
         return Promise.all(this.graphs.map(([graph], index) => {
             const { signal } = this.abortControllers[graph];
+            if (!this.api) {
+                return Promise.resolve([]);
+            }
             return this.api
-                .route(Object.assign({ graph, via: `${formattedViaPoints.join('|')}`, mot: `${this.mot}`, 'resolve-hops': false, elevation: false, 'coord-radius': 100.0, 'coord-punish': 1000.0 }, this.routingApiParams), { signal })
+                .route(Object.assign({ graph, via: `${formattedViaPoints.join('|')}`, mot: this.mot, 
+                // @ts-ignore missing property in swagger
+                'resolve-hops': false, elevation: false, 'coord-radius': 100.0, 'coord-punish': 1000.0 }, (this.routingApiParams || {})), { signal })
                 .then((featureCollection) => {
+                var _a, _b, _c, _d;
                 this.segments = this.format.readFeatures(featureCollection);
                 if (this.mot === 'foot') {
                     // Extract unique values from viaPoint target value
@@ -317,9 +319,12 @@ class RoutingControl extends ControlCommon {
                 });
                 routeFeature.set('graph', graph);
                 routeFeature.set('mot', this.mot);
-                routeFeature.set('minResolution', this.graphsResolutions[index][0]);
-                routeFeature.set('maxResolution', this.graphsResolutions[index][1]);
-                this.routingLayer.olLayer.getSource().addFeature(routeFeature);
+                if (this.graphsResolutions &&
+                    ((_a = this.graphsResolutions[index]) === null || _a === void 0 ? void 0 : _a.length) >= 2) {
+                    routeFeature.set('minResolution', this.graphsResolutions[index][0]);
+                    routeFeature.set('maxResolution', this.graphsResolutions[index][1]);
+                }
+                (_d = (_c = (_b = this.routingLayer) === null || _b === void 0 ? void 0 : _b.olLayer) === null || _c === void 0 ? void 0 : _c.getSource()) === null || _d === void 0 ? void 0 : _d.addFeature(routeFeature);
                 this.loading = false;
             })
                 .catch((error) => {
@@ -329,10 +334,7 @@ class RoutingControl extends ControlCommon {
                 }
                 this.segments = [];
                 // Dispatch error event and execute error function
-                this.dispatchEvent({
-                    type: 'error',
-                    target: this,
-                });
+                this.dispatchEvent(new BaseEvent('error'));
                 this.onRouteError(error, this);
                 this.loading = false;
             });
@@ -344,12 +346,13 @@ class RoutingControl extends ControlCommon {
      * @private
      */
     drawViaPoint(viaPoint, idx, abortController) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const pointFeature = new Feature();
         pointFeature.set('viaPointIdx', idx);
         // The via point is a coordinate using the current map's projection
         if (Array.isArray(viaPoint)) {
             pointFeature.setGeometry(new Point(viaPoint));
-            this.routingLayer.olLayer.getSource().addFeature(pointFeature);
+            (_c = (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.olLayer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.addFeature(pointFeature);
             return Promise.resolve(pointFeature);
         }
         // Possibility to parse:
@@ -360,7 +363,8 @@ class RoutingControl extends ControlCommon {
             let stationId;
             let track;
             if (this.useRawViaPoints) {
-                [, stationId, , track] = REGEX_VIA_POINT_STATION_ID.exec(viaPoint);
+                [, stationId, , track] =
+                    REGEX_VIA_POINT_STATION_ID.exec(viaPoint) || [];
             }
             else {
                 [stationId, track] = viaPoint.split('$');
@@ -368,11 +372,12 @@ class RoutingControl extends ControlCommon {
             return fetch(`${this.stopsApiUrl}lookup/${stationId}?key=${this.stopsApiKey}`, { signal: abortController.signal })
                 .then((res) => res.json())
                 .then((stationData) => {
+                var _a, _b, _c;
                 const { coordinates } = stationData.features[0].geometry;
                 this.cacheStationData[viaPoint] = fromLonLat(coordinates);
                 pointFeature.set('viaPointTrack', track);
                 pointFeature.setGeometry(new Point(fromLonLat(coordinates)));
-                this.routingLayer.olLayer.getSource().addFeature(pointFeature);
+                (_c = (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.olLayer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.addFeature(pointFeature);
                 return pointFeature;
             })
                 .catch((error) => {
@@ -381,10 +386,7 @@ class RoutingControl extends ControlCommon {
                     return;
                 }
                 // Dispatch error event and execute error function
-                this.dispatchEvent({
-                    type: 'error',
-                    target: this,
-                });
+                this.dispatchEvent(new BaseEvent('error'));
                 this.onRouteError(error, this);
                 this.loading = false;
             });
@@ -394,10 +396,10 @@ class RoutingControl extends ControlCommon {
         //
         // 47.37811,8.53935 a position 47.37811, 8.53935
         if (this.useRawViaPoints && REGEX_VIA_POINT_COORD.test(viaPoint)) {
-            const [lat, lon] = REGEX_VIA_POINT_COORD.exec(viaPoint);
-            const coordinates = fromLonLat([parseFloat(lon), parseFloat(lat)], this.map.getView().getProjection());
+            const [lat, lon] = REGEX_VIA_POINT_COORD.exec(viaPoint) || [];
+            const coordinates = fromLonLat([parseFloat(lon), parseFloat(lat)], (_d = this.map) === null || _d === void 0 ? void 0 : _d.getView().getProjection());
             pointFeature.setGeometry(new Point(coordinates));
-            this.routingLayer.olLayer.getSource().addFeature(pointFeature);
+            (_g = (_f = (_e = this.routingLayer) === null || _e === void 0 ? void 0 : _e.olLayer) === null || _f === void 0 ? void 0 : _f.getSource()) === null || _g === void 0 ? void 0 : _g.addFeature(pointFeature);
             return Promise.resolve(pointFeature);
         }
         // Only when this.useRawViaPoints is true.
@@ -408,31 +410,29 @@ class RoutingControl extends ControlCommon {
         // @47.37811,8.53935 a station at position 47.37811, 8.53935
         // @47.37811,8.53935$4 track 4 in a station at position 47.37811, 8.53935
         // zürich hb@47.37811,8.53935$8 track 8 in station "Zürich HB" at position 47.37811, 8.53935
-        const [, stationName, , lat, lon, , track] = REGEX_VIA_POINT.exec(viaPoint);
+        const [, stationName, , lat, lon, , track] = REGEX_VIA_POINT.exec(viaPoint) || [];
         if (lon && lat) {
-            const coordinates = fromLonLat([parseFloat(lon), parseFloat(lat)], this.map.getView().getProjection());
+            const coordinates = fromLonLat([parseFloat(lon), parseFloat(lat)], (_h = this.map) === null || _h === void 0 ? void 0 : _h.getView().getProjection());
             pointFeature.set('viaPointTrack', track);
             pointFeature.setGeometry(new Point(coordinates));
-            this.routingLayer.olLayer.getSource().addFeature(pointFeature);
+            (_l = (_k = (_j = this.routingLayer) === null || _j === void 0 ? void 0 : _j.olLayer) === null || _k === void 0 ? void 0 : _k.getSource()) === null || _l === void 0 ? void 0 : _l.addFeature(pointFeature);
             return Promise.resolve(pointFeature);
         }
         if (stationName) {
             return fetch(`${this.stopsApiUrl}?key=${this.stopsApiKey}&q=${stationName}&limit=1`, { signal: abortController.signal })
                 .then((res) => res.json())
                 .then((stationData) => {
+                var _a, _b, _c;
                 const { coordinates } = stationData.features[0].geometry;
                 this.cacheStationData[viaPoint] = fromLonLat(coordinates);
                 pointFeature.set('viaPointTrack', track);
                 pointFeature.setGeometry(new Point(fromLonLat(coordinates)));
-                this.routingLayer.olLayer.getSource().addFeature(pointFeature);
+                (_c = (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.olLayer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.addFeature(pointFeature);
                 return pointFeature;
             })
                 .catch((error) => {
                 // Dispatch error event and execute error function
-                this.dispatchEvent({
-                    type: 'error',
-                    target: this,
-                });
+                this.dispatchEvent(new BaseEvent('error'));
                 this.onRouteError(error, this);
                 this.loading = false;
                 return null;
@@ -446,8 +446,8 @@ class RoutingControl extends ControlCommon {
      *   If an existing viaPoint is clicked removes the clicked viaPoint.
      * @private
      */
-    onMapClick(e) {
-        const feats = e.target.getFeaturesAtPixel(e.pixel);
+    onMapClick(evt) {
+        const feats = evt.target.getFeaturesAtPixel(evt.pixel);
         const viaPoint = feats.find((feat) => {
             var _a;
             return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === GeomType.POINT &&
@@ -458,7 +458,7 @@ class RoutingControl extends ControlCommon {
             this.removeViaPoint(viaPoint.get('viaPointIdx'));
             return;
         }
-        this.addViaPoint(e.coordinate);
+        this.addViaPoint(evt.coordinate);
     }
     /**
      * Used on start of the modify interaction. Stores relevant data
@@ -466,16 +466,19 @@ class RoutingControl extends ControlCommon {
      * @private
      */
     onModifyStart(evt) {
+        var _a;
         // When modify start, we search the index of the segment that is modifying.
         let segmentIndex = -1;
         const route = evt.features
             .getArray()
             .find((feat) => { var _a; return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === GeomType.LINE_STRING; });
         // Find the segment index that is being modified
-        if (route) {
+        if (route && route.getGeometry() && evt.mapBrowserEvent.coordinate) {
             // We use a buff extent to fix floating issues , see https://github.com/openlayers/openlayers/issues/7130#issuecomment-535856422
-            const closestExtent = buffer(new Point(route.getGeometry().getClosestPoint(evt.mapBrowserEvent.coordinate)).getExtent(), 0.001);
-            segmentIndex = this.segments.findIndex((segment) => segment.getGeometry().intersectsExtent(closestExtent));
+            const closestExtent = buffer(new Point(
+            // @ts-ignore
+            (_a = route.getGeometry()) === null || _a === void 0 ? void 0 : _a.getClosestPoint(evt.mapBrowserEvent.coordinate)).getExtent(), 0.001);
+            segmentIndex = this.segments.findIndex((segment) => { var _a; return (_a = segment.getGeometry()) === null || _a === void 0 ? void 0 : _a.intersectsExtent(closestExtent); });
         }
         // Find the viaPoint that is being modified
         const viaPoint = (evt.features
@@ -498,7 +501,7 @@ class RoutingControl extends ControlCommon {
      */
     onModifyEnd(evt) {
         const coord = evt.mapBrowserEvent.coordinate;
-        const { oldRoute, viaPoint, segmentIndex } = this.initialRouteDrag;
+        const { oldRoute, viaPoint, segmentIndex } = this.initialRouteDrag || {};
         // If viaPoint is being relocated overwrite the old viaPoint
         if (viaPoint) {
             return this.addViaPoint(coord, viaPoint.get('viaPointIdx'), 1);
@@ -512,7 +515,7 @@ class RoutingControl extends ControlCommon {
             return Promise.reject(new Error('No segment found'));
         }
         // Insert new viaPoint at the  modified segment index + 1
-        return this.addViaPoint(coord, segmentIndex + 1);
+        return this.addViaPoint(coord, (segmentIndex || 0) + 1);
     }
     /**
      * Define a default element.
@@ -536,15 +539,16 @@ class RoutingControl extends ControlCommon {
      * @private
      */
     createModifyInteraction() {
+        var _a, _b, _c;
         /**
          * @type {ol.interaction.Modify}
          * @private
          */
         // Define and add modify interaction
         this.modifyInteraction = new Modify({
-            source: this.routingLayer.olLayer.getSource(),
+            source: ((_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.olLayer) === null || _b === void 0 ? void 0 : _b.getSource()) || undefined,
             pixelTolerance: 4,
-            hitDetection: this.routingLayer.olLayer,
+            hitDetection: (_c = this.routingLayer) === null || _c === void 0 ? void 0 : _c.olLayer,
             deleteCondition: (e) => {
                 const feats = e.target.getFeaturesAtPixel(e.pixel, {
                     hitTolerance: 5,
@@ -571,21 +575,25 @@ class RoutingControl extends ControlCommon {
      * @private
      */
     addListeners() {
+        var _a;
         if (!this.modify) {
             return;
         }
         this.removeListeners();
         /** @ignore */
-        this.onMapClickKey = this.map.on('singleclick', this.onMapClick);
+        this.onMapClickKey = (_a = this.map) === null || _a === void 0 ? void 0 : _a.on('singleclick', this.onMapClick);
     }
     /**
      * Remove click listener from map.
      * @private
      */
     removeListeners() {
-        unByKey(this.onMapClickKey);
+        if (this.onMapClickKey) {
+            unByKey(this.onMapClickKey);
+        }
     }
     activate() {
+        var _a, _b;
         super.activate();
         if (this.map) {
             /** @ignore */
@@ -595,24 +603,26 @@ class RoutingControl extends ControlCommon {
             /** @ignore */
             this.graphsResolutions = RoutingControl.getGraphsResolutions(this.graphs, this.map);
             // Clean the modifyInteraction if present
-            this.map.removeInteraction(this.modifyInteraction);
+            if (this.modifyInteraction) {
+                this.map.removeInteraction(this.modifyInteraction);
+            }
             // Add modify interaction, RoutingLayer and listeners
-            this.routingLayer.attachToMap(this.map);
-            this.map.addInteraction(this.modifyInteraction);
-            this.modifyInteraction.setActive(this.modify);
+            (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.attachToMap(this.map);
+            if (this.modifyInteraction) {
+                this.map.addInteraction(this.modifyInteraction);
+            }
+            (_b = this.modifyInteraction) === null || _b === void 0 ? void 0 : _b.setActive(this.modify);
             this.addListeners();
         }
-        else {
-            // fall back to some default values if map is not available
-            this.format = new GeoJSON({ featureProjection: 'EPSG:3857' });
-            this.graphsResolutions = this.graphs;
-        }
     }
     deactivate() {
+        var _a;
         if (this.map) {
             // Remove modify interaction, RoutingLayer, listeners and viaPoints
-            this.routingLayer.detachFromMap(this.map);
-            this.map.removeInteraction(this.modifyInteraction);
+            (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.detachFromMap();
+            if (this.modifyInteraction) {
+                this.map.removeInteraction(this.modifyInteraction);
+            }
             this.removeListeners();
             this.reset();
         }

package/ol/layers/Layer.d.ts

@@ -3,9 +3,10 @@ import { EventsKey } from 'ol/events';
 import LayerGroup from 'ol/layer/Group';
 import OlLayer from 'ol/layer/Layer';
 import LayerCommon from '../../common/layers/LayerCommon';
+import type { LayerCommonOptions } from '../../common/layers/LayerCommon';
 import type { UserInteractionCallback } from '../../types';
 export declare type OlLayerOptions = LayerCommonOptions & {
-    olLayer: OlLayer | LayerGroup;
+    olLayer?: OlLayer;
 };
 declare const Layer_base: typeof LayerCommon;
 /**
@@ -24,7 +25,7 @@ declare const Layer_base: typeof LayerCommon;
  * @extends {LayerCommon}
  */
 declare class Layer extends Layer_base {
-    olLayer?: OlLayer;
+    olLayer?: OlLayer | LayerGroup;
     olListenersKeys: EventsKey[];
     options: OlLayerOptions;
     visible: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/Layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,UAAU,MAAM,gBAAgB,CAAC;AACxC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAE1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAE3D,oBAAY,cAAc,GAAG,kBAAkB,GAAG;IAChD,OAAO,EAAE,OAAO,GAAG,UAAU,CAAC;CAC/B,CAAC;;AAEF;;;;;;;;;;;;;;GAcG;AACH,cAAM,KAAM,SAAQ,UAAkC;IACpD,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,eAAe,EAAG,SAAS,EAAE,CAAC;IAI9B,OAAO,EAAG,cAAc,CAAC;IAEzB,OAAO,EAAG,OAAO,CAAC;IAElB,UAAU,EAAG,MAAM,EAAE,CAAC;IAEtB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,sBAAsB,EAAG,SAAS,CAAC;IAEnC,sBAAsB,EAAG,SAAS,CAAC;IAInC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAE/C,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAE/C,mBAAmB,EAAG,MAAM,IAAI,CAAC;IAEjC,kBAAkB,EAAG,MAAM,IAAI,CAAC;IAEhC;;;;;;;;;;;OAWG;gBACS,OAAO,EAAE,cAAc;IAQnC;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,cAAc;IAUxC;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,GAAG;IAyDpB;;OAEG;IACH,aAAa;IAcb,wBAAwB;IA2BxB,0BAA0B;IAI1B;;;OAGG;IACH,sBAAsB;IAQtB;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,cAAc;CAGjC;AACD,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/Layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,UAAU,MAAM,gBAAgB,CAAC;AACxC,OAAO,OAAO,MAAM,gBAAgB,CAAC;AAErC,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAE3D,oBAAY,cAAc,GAAG,kBAAkB,GAAG;IAChD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;;AAEF;;;;;;;;;;;;;;GAcG;AACH,cAAM,KAAM,SAAQ,UAAkC;IACpD,OAAO,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IAE/B,eAAe,EAAG,SAAS,EAAE,CAAC;IAI9B,OAAO,EAAG,cAAc,CAAC;IAEzB,OAAO,EAAG,OAAO,CAAC;IAElB,UAAU,EAAG,MAAM,EAAE,CAAC;IAEtB,GAAG,CAAC,EAAE,GAAG,CAAC;IAEV,sBAAsB,EAAG,SAAS,CAAC;IAEnC,sBAAsB,EAAG,SAAS,CAAC;IAInC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAE3B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAEhC,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAE/C,kBAAkB,CAAC,EAAE,uBAAuB,EAAE,CAAC;IAE/C,mBAAmB,EAAG,MAAM,IAAI,CAAC;IAEjC,kBAAkB,EAAG,MAAM,IAAI,CAAC;IAEhC;;;;;;;;;;;OAWG;gBACS,OAAO,EAAE,cAAc;IAQnC;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,cAAc;IAUxC;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,GAAG;IA4DpB;;OAEG;IACH,aAAa;IAcb,wBAAwB;IA2BxB,0BAA0B;IAI1B;;;OAGG;IACH,sBAAsB;IAQtB;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,cAAc;CAGjC;AACD,eAAe,KAAK,CAAC"}

package/ol/layers/Layer.js

@@ -94,8 +94,10 @@ class Layer extends userInteractionsMixin(LayerCommon) {
                         (_a = layer.getSource()) === null || _a === void 0 ? void 0 : _a.setAttributions(attributions);
                     }
                 });
+                // @ts-ignore
             }
             else if (this.olLayer.getSource) {
+                // @ts-ignore
                 (_d = this.olLayer.getSource()) === null || _d === void 0 ? void 0 : _d.setAttributions(attributions);
             }
         }

package/ol/layers/MapGlLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapGlLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/MapGlLayer.ts"],"names":[],"mappings":";AAEA,OAAgB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEhD,oBAAY,iBAAiB,GAAG,cAAc,GAAG;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,cAAM,UAAW,SAAQ,KAAK;IAC5B,KAAK,CAAC,EAAE,YAAY,CAAC;IAErB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,UAAU,EAAG,MAAM,CAAC;IAEpB,MAAM,EAAG,OAAO,CAAC;IAEjB,MAAM,EAAG,OAAO,CAAC;IAEjB,OAAO,EAAG,iBAAiB,CAAC;gBAEhB,OAAO,EAAE,iBAAiB;IAmCtC;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,KAAK;IAkBtB;;OAEG;IACH,aAAa;IAab;;;OAGG;IACH,SAAS;IA2ET;;;OAGG;IACH,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,aAAa,GAAG,QAAQ,CAAC,WAAW;IAQtE;;;;;OAKG;IACH,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,2BAA2B,CAAC;IAqDvC;;;OAGG;IAEH,gBAAgB,IAAI,cAAc;IAOlC;;;;OAIG;IAEH,iBAAiB,IAAI,iBAAiB;CAMvC;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"MapGlLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/MapGlLayer.ts"],"names":[],"mappings":";AAEA,OAAgB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEzD,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,KAAK,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEhD,oBAAY,iBAAiB,GAAG,cAAc,GAAG;IAC/C,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,cAAM,UAAW,SAAQ,KAAK;IAC5B,KAAK,CAAC,EAAE,YAAY,CAAC;IAErB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,UAAU,EAAG,MAAM,CAAC;IAEpB,MAAM,EAAG,OAAO,CAAC;IAEjB,MAAM,EAAG,OAAO,CAAC;IAEjB,OAAO,EAAG,iBAAiB,CAAC;gBAEhB,OAAO,EAAE,iBAAiB;IAmCtC;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,KAAK;IAkBtB;;OAEG;IACH,aAAa;IAab;;;OAGG;IACH,SAAS;IAuET;;;OAGG;IACH,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,aAAa,GAAG,QAAQ,CAAC,WAAW;IAStE;;;;;OAKG;IACH,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,GAAG,GACX,OAAO,CAAC,2BAA2B,CAAC;IAqDvC;;;OAGG;IAEH,gBAAgB,IAAI,cAAc;IAOlC;;;;OAIG;IAEH,iBAAiB,IAAI,iBAAiB;CAMvC;AAED,eAAe,UAAU,CAAC"}

package/ol/layers/MapGlLayer.js

@@ -3,6 +3,7 @@ import { toLonLat } from 'ol/proj';
 import OlLayer from 'ol/layer/Layer';
 import Source from 'ol/source/Source';
 import GeoJSON from 'ol/format/GeoJSON';
+import BaseEvent from 'ol/events/Event';
 import { getUrlWithParams, getMapboxMapCopyrights } from '../../common/utils';
 import Layer from './Layer';
 /**
@@ -122,11 +123,7 @@ class MapGlLayer extends Layer {
              * @type {boolean}
              */
             this.loaded = true;
-            // @ts-ignore
-            this.dispatchEvent({
-                type: 'load',
-                target: this,
-            });
+            this.dispatchEvent(new BaseEvent('load'));
         });
         this.mbMap.on('idle', this.updateAttribution);
     }
@@ -139,6 +136,7 @@ class MapGlLayer extends Layer {
         const newAttributions = getMapboxMapCopyrights(evt.target) || [];
         if (((_a = this.copyrights) === null || _a === void 0 ? void 0 : _a.toString()) !== newAttributions.toString()) {
             this.copyrights = newAttributions;
+            // @ts-ignore
             (_c = (_b = this.olLayer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.setAttributions(newAttributions);
         }
     }

package/ol/layers/MapboxLayer.d.ts

@@ -38,7 +38,7 @@ export default class MapboxLayer extends MapGlLayer {
      * @private
      */
     loadMbMap(): void;
-    getOlLayerRender(): (frameState: import("ol/PluggableMap").FrameState) => HTMLElement;
+    getOlLayerRender(): import("ol/layer/Layer").RenderFunction;
     getMapboxMapClass(): typeof Map;
     /**
      * Create a copy of the MapboxLayer.

package/ol/layers/MapboxLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MapboxLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/MapboxLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE7D;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,UAAU;IACjD,WAAW,CAAC,EAAE;QACZ,MAAM,CAAC,EAAE,UAAU,CAAC;QACpB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,IAAI,CAAC;KACb,CAAC;IAEF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,KAAK;IAsBtB;;;OAGG;IACH,SAAS;IAoDT,gBAAgB;IAKhB,iBAAiB;IAIjB;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,iBAAiB;CAGpC"}
+{"version":3,"file":"MapboxLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/MapboxLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,KAAK,KAAK,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE/B,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE7D;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,UAAU;IACjD,WAAW,CAAC,EAAE;QACZ,MAAM,CAAC,EAAE,UAAU,CAAC;QACpB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,CAAC,EAAE,IAAI,CAAC;KACb,CAAC;IAEF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;;OAGG;IACH,WAAW,CAAC,GAAG,EAAE,KAAK;IAsBtB;;;OAGG;IACH,SAAS;IAqDT,gBAAgB;IAKhB,iBAAiB;IAIjB;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,iBAAiB;CAGpC"}

package/ol/layers/MapboxLayer.js

@@ -76,6 +76,7 @@ export default class MapboxLayer extends MapGlLayer {
             this.mbMap.resize();
             /** @ignore */
             this.copyrights = getMapboxMapCopyrights(this.mbMap) || [];
+            // @ts-ignore
             (_b = (_a = this.olLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.setAttributions(this.copyrights);
         });
         const mapboxCanvas = this.mbMap.getCanvas();

package/ol/layers/MapboxStyleLayer.js

@@ -98,8 +98,10 @@ class MapboxStyleLayer extends Layer {
             };
         }
         if (!this.styleLayersFilter && this.styleLayers) {
-            const ids = this.styleLayers.map((s) => s.id);
-            this.styleLayersFilter = (styleLayer) => ids.includes(styleLayer.id);
+            this.styleLayersFilter = (styleLayer) => {
+                var _a;
+                return !!((_a = this.styleLayers) === null || _a === void 0 ? void 0 : _a.find((sl) => styleLayer.id === sl.id));
+            };
         }
     }
     /**

package/ol/layers/MaplibreLayer.d.ts

@@ -15,7 +15,8 @@ import MapGlLayer, { MapGlLayerOptions } from './MapGlLayer';
  * @extends {Layer}
  */
 export default class MaplibreLayer extends MapGlLayer {
-    getOlLayerRender(): (frameState: any) => any;
+    mbMap?: maplibregl.Map;
+    getOlLayerRender(): import("ol/layer/Layer").RenderFunction;
     getMapboxMapClass(): typeof Map;
     /**
      * Create a copy of the MapboxLayer.

package/ol/layers/MaplibreLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MaplibreLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/MaplibreLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE7D;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,gBAAgB;IAKhB,iBAAiB;IAIjB;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,iBAAiB;CAGpC"}
+{"version":3,"file":"MaplibreLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/MaplibreLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,UAAU,EAAE,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE7D;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,KAAK,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC;IAEvB,gBAAgB;IAKhB,iBAAiB;IAIjB;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,iBAAiB;CAGpC"}