mobility-toolbox-js 2.0.0-beta.46 → 2.0.0-beta.47

package/ol/controls/CopyrightControl.d.ts

@@ -1,4 +1,6 @@
-export default CopyrightControl;
+import { MapEvent } from 'ol';
+import { FrameState } from 'ol/PluggableMap';
+import CopyrightControlCommon from '../../common/controls/CopyrightControlCommon';
 /**
  * Display layer's copyrights.
  *
@@ -15,17 +17,15 @@ export default CopyrightControl;
  *
  * @see <a href="/example/ol-copyright">Openlayers copyright example</a>
  *
- * @extends {Control}
- * @implements {CopyrightInterface}
+ * @extends {CopyrightControlCommon}
  */
-declare class CopyrightControl extends Control implements CopyrightInterface {
+declare class CopyrightControl extends CopyrightControlCommon {
+    frameState?: FrameState;
     constructor(options: any);
-    onPostRender(evt: any): void;
     getCopyrights(): any[];
-    /**
-     * @ignore
-     */
-    frameState: any;
+    activate(): void;
+    deactivate(): void;
+    onPostRender(evt: MapEvent): void;
 }
-import Control from "../../common/controls/Control";
+export default CopyrightControl;
 //# sourceMappingURL=CopyrightControl.d.ts.map

package/ol/controls/CopyrightControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CopyrightControl.d.ts","sourceRoot":"","sources":["../../../src/ol/controls/CopyrightControl.js"],"names":[],"mappings":";AAKA;;;;;;;;;;;;;;;;;;GAkBG;AACH,0DAFgB,kBAAkB;IAGhC,0BAGC;IAwCD,6BAQC;IA9CD,uBAsBC;IAkBG;;OAEG;IACH,gBAAgC;CAIrC"}
+{"version":3,"file":"CopyrightControl.d.ts","sourceRoot":"","sources":["../../../src/ol/controls/CopyrightControl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,sBAAsB,MAAM,8CAA8C,CAAC;AAGlF;;;;;;;;;;;;;;;;;GAiBG;AACH,cAAM,gBAAiB,SAAQ,sBAAsB;IACnD,UAAU,CAAC,EAAE,UAAU,CAAC;gBAEZ,OAAO,EAAE,GAAG;IAKxB,aAAa;IAyBb,QAAQ;IAOR,UAAU;IAOV,YAAY,CAAC,GAAG,EAAE,QAAQ;CAS3B;AAED,eAAe,gBAAgB,CAAC"}

package/ol/controls/CopyrightControl.js

@@ -1,6 +1,5 @@
 import { inView } from 'ol/layer/Layer';
-import Control from '../../common/controls/Control';
-import mixin from '../../common/mixins/CopyrightMixin';
+import CopyrightControlCommon from '../../common/controls/CopyrightControlCommon';
 import removeDuplicate from '../../common/utils/removeDuplicate';
 /**
  * Display layer's copyrights.
@@ -18,23 +17,24 @@ import removeDuplicate from '../../common/utils/removeDuplicate';
  *
  * @see <a href="/example/ol-copyright">Openlayers copyright example</a>
  *
- * @extends {Control}
- * @implements {CopyrightInterface}
+ * @extends {CopyrightControlCommon}
  */
-class CopyrightControl extends mixin(Control) {
+class CopyrightControl extends CopyrightControlCommon {
     constructor(options) {
         super(options);
         this.onPostRender = this.onPostRender.bind(this);
     }
     getCopyrights() {
+        var _a;
         if (!this.frameState) {
             return [];
         }
         let copyrights = [];
         // This code loop comes mainly from ol.
-        this.frameState.layerStatesArray.forEach((layerState) => {
+        (_a = this.frameState) === null || _a === void 0 ? void 0 : _a.layerStatesArray.forEach((layerState) => {
             const { layer } = layerState;
-            if (inView(layerState, this.frameState.viewState) &&
+            if (this.frameState &&
+                inView(layerState, this.frameState.viewState) &&
                 layer &&
                 layer.getSource &&
                 layer.getSource() &&
@@ -61,7 +61,7 @@ class CopyrightControl extends mixin(Control) {
             /**
              * @ignore
              */
-            this.frameState = evt.frameState;
+            this.frameState = evt.frameState || undefined;
             this.render();
         }
     }

package/ol/controls/RoutingControl.d.ts

@@ -30,7 +30,7 @@ export default RoutingControl;
  * @extends {Control}
  * @implements {RoutingInterface}
  */
-declare class RoutingControl extends Control implements RoutingInterface {
+declare class RoutingControl implements RoutingInterface {
     /**
      * Calculate at which resolutions corresponds each generalizations.
      *
@@ -93,7 +93,7 @@ declare class RoutingControl extends Control implements RoutingInterface {
      */
     private onModifyStart;
     /** @ignore */
-    apiChangeListener: () => Promise<any[]> | Promise<void | Feature<import("ol/geom/Geometry").default>> | Promise<Feature<import("ol/geom/Geometry").default> | null> | null;
+    apiChangeListener: () => Promise<void | Feature<import("ol/geom/Geometry").default>> | Promise<Feature<import("ol/geom/Geometry").default> | null> | Promise<any[]> | null;
     /**
      * Adds/Replaces a viaPoint to the viaPoints array and redraws route:
      *   Adds a viaPoint at end of array by default.
@@ -145,6 +145,12 @@ declare class RoutingControl extends Control implements RoutingInterface {
         oldRoute: any;
         segmentIndex: number;
     } | undefined;
+    /**
+     * Define a default element.
+     *
+     * @private
+     */
+    private createDefaultElement;
     /** @ignore */
     element: HTMLButtonElement | undefined;
     /**
@@ -169,12 +175,13 @@ declare class RoutingControl extends Control implements RoutingInterface {
      * @private
      */
     private removeListeners;
+    activate(): void;
     /** @ignore */
     format: GeoJSON | undefined;
     /** @ignore */
     graphsResolutions: any;
+    deactivate(): void;
 }
-import Control from "../../common/controls/Control";
 import { RoutingAPI } from "../../api";
 import { Feature } from "ol";
 import { GeoJSON } from "ol/format";

package/ol/controls/RoutingControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoutingControl.d.ts","sourceRoot":"","sources":["../../../src/ol/controls/RoutingControl.js"],"names":[],"mappings":";AAiDA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wDAFgB,gBAAgB;IAoH9B;;;;OAIG;IACH,oCAMC;IA5HD,0BA+GC;IAlFC,qDAAqD;IACrD,iBAAoB;IAEpB,cAAc;IACd,YAAgD;IAEhD,cAAc;IACd,SAA+B;IAE/B,cAAc;IACd,gBAAsC;IAEtC,cAAc;IACd,sBAAsD;IAEtD,cAAc;IACd,qBAAuD;IAEvD,cAAc;IACd,0BAAiE;IAEjE,cAAc;IACd,qBAA0B;IAE1B,cAAc;IACd,wBAA0B;IAE1B,cAAc;IACd,YAA4B;IAE5B,cAAc;IACd,iBAAqD;IAErD,cAAc;IACd,gBAAkB;IAElB,cAAc;IACd,iBAA0E;IAE1E,cAAc;IACd,gBAEE;IAEF,cAAc;IACd,kBAKI;IAEJ,cAAc;IACd,kBAUI;IAEJ,cAAc;IACd,iBAAmB;IAoXrB;;;;;OAKG;IACH,mBAeC;IA4CD;;;;;OAKG;IACH,oBAqBC;IArED;;;;OAIG;IACH,sBAmCC;IAxaC,cAAc;IACd,2KAA+C;IAmBjD;;;;;;;;;OASG;IACH,wGAYC;IAED;;;;OAIG;IACH,uBAFW,MAAM,QAYhB;IAED;;;OAGG;IACH,8BAFW,MAAM,MAAM,MAAM,CAAC,CAAC,QAS9B;IAED;;OAEG;IACH,cASC;IAED;;;OAGG;IACH,sBAeC;IAED;;;;;;OAMG;IACH,kBA0HC;IAED;;;;OAIG;IACH,qBAkHC;IA2DC,cAAc;IACd;;;;kBAIC;IAsCD,cAAc;IACd,uCAA+C;IAYjD;;;OAGG;IACH,gCA8BC;IA7BC;;;OAGG;IAEH,0BAoBE;IAMJ;;;OAGG;IACH,qBAOC;IAFC,cAAc;IACd,mBAAgE;IAGlE;;;OAGG;IACH,wBAEC;IAKG,cAAc;IACd,4BAEE;IAEF,cAAc;IACd,uBAGC;CA2BN"}
+{"version":3,"file":"RoutingControl.d.ts","sourceRoot":"","sources":["../../../src/ol/controls/RoutingControl.js"],"names":[],"mappings":";AAiDA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wCAFgB,gBAAgB;IAoH9B;;;;OAIG;IACH,oCAMC;IA5HD,0BA+GC;IAlFC,qDAAqD;IACrD,iBAAoB;IAEpB,cAAc;IACd,YAAgD;IAEhD,cAAc;IACd,SAA+B;IAE/B,cAAc;IACd,gBAAsC;IAEtC,cAAc;IACd,sBAAsD;IAEtD,cAAc;IACd,qBAAuD;IAEvD,cAAc;IACd,0BAAiE;IAEjE,cAAc;IACd,qBAA0B;IAE1B,cAAc;IACd,wBAA0B;IAE1B,cAAc;IACd,YAA4B;IAE5B,cAAc;IACd,iBAAqD;IAErD,cAAc;IACd,gBAAkB;IAElB,cAAc;IACd,iBAA0E;IAE1E,cAAc;IACd,gBAEE;IAEF,cAAc;IACd,kBAKI;IAEJ,cAAc;IACd,kBAUI;IAEJ,cAAc;IACd,iBAAmB;IAoXrB;;;;;OAKG;IACH,mBAeC;IA4CD;;;;;OAKG;IACH,oBAqBC;IArED;;;;OAIG;IACH,sBAmCC;IAxaC,cAAc;IACd,2KAA+C;IAmBjD;;;;;;;;;OASG;IACH,wGAYC;IAED;;;;OAIG;IACH,uBAFW,MAAM,QAYhB;IAED;;;OAGG;IACH,8BAFW,MAAM,MAAM,MAAM,CAAC,CAAC,QAS9B;IAED;;OAEG;IACH,cASC;IAED;;;OAGG;IACH,sBAeC;IAED;;;;;;OAMG;IACH,kBA0HC;IAED;;;;OAIG;IACH,qBAkHC;IA2DC,cAAc;IACd;;;;kBAIC;IAgCH;;;;OAIG;IACH,6BAYC;IAXC,cAAc;IACd,uCAA+C;IAYjD;;;OAGG;IACH,gCA8BC;IA7BC;;;OAGG;IAEH,0BAoBE;IAMJ;;;OAGG;IACH,qBAOC;IAFC,cAAc;IACd,mBAAgE;IAGlE;;;OAGG;IACH,wBAEC;IAED,iBA2BC;IAxBG,cAAc;IACd,4BAEE;IAEF,cAAc;IACd,uBAGC;IAiBL,mBASC;CACF"}

package/ol/controls/RoutingControl.js

@@ -8,7 +8,7 @@ import { buffer } from 'ol/extent';
 import { fromLonLat, toLonLat } from 'ol/proj';
 import GeomType from 'ol/geom/GeometryType';
 import { RoutingAPI } from '../../api';
-import Control from '../../common/controls/Control';
+import ControlCommon from '../../common/controls/ControlCommon';
 import RoutingLayer from '../layers/RoutingLayer';
 // Examples for a single hop:
 // basel sbb a station named "basel sbb"
@@ -71,7 +71,7 @@ const getFlatCoordinatesFromSegments = (segmentArray) => {
  * @extends {Control}
  * @implements {RoutingInterface}
  */
-class RoutingControl extends Control {
+class RoutingControl extends ControlCommon {
     constructor(options = {}) {
         super(options);
         Object.defineProperties(this, {

package/ol/controls/StopFinderControl.d.ts

@@ -1,4 +1,5 @@
-export default StopFinderControl;
+import { Feature } from 'geojson';
+import StopFinderControlCommon from '../../common/controls/StopFinderControlCommon';
 /**
  * Search stations.
  *
@@ -18,15 +19,12 @@ export default StopFinderControl;
  *
  *
  * @see <a href="/example/ol-search">Openlayers search example</a>
- *
- * @extends {Control}
- * @implements {StopFinderInterface}
  */
-declare class StopFinderControl extends Control implements StopFinderInterface {
+declare class StopFinderControl extends StopFinderControlCommon {
     /**
      * @private
      */
-    private onSuggestionClick;
+    onSuggestionClick(suggestion: Feature): void;
 }
-import Control from "../../common/controls/Control";
+export default StopFinderControl;
 //# sourceMappingURL=StopFinderControl.d.ts.map

package/ol/controls/StopFinderControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StopFinderControl.d.ts","sourceRoot":"","sources":["../../../src/ol/controls/StopFinderControl.js"],"names":[],"mappings":";AAIA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,2DAFgB,mBAAmB;IAGjC;;OAEG;IACH,0BAGC;CACF"}
+{"version":3,"file":"StopFinderControl.d.ts","sourceRoot":"","sources":["../../../src/ol/controls/StopFinderControl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAS,MAAM,SAAS,CAAC;AAGzC,OAAO,uBAAuB,MAAM,+CAA+C,CAAC;AAEpF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,cAAM,iBAAkB,SAAQ,uBAAuB;IACrD;;OAEG;IACH,iBAAiB,CAAC,UAAU,EAAE,OAAO;CAItC;AAED,eAAe,iBAAiB,CAAC"}

package/ol/controls/StopFinderControl.js

@@ -1,6 +1,5 @@
 import { fromLonLat } from 'ol/proj';
-import Control from '../../common/controls/Control';
-import mixin from '../../common/mixins/StopFinderMixin';
+import StopFinderControlCommon from '../../common/controls/StopFinderControlCommon';
 /**
  * Search stations.
  *
@@ -20,16 +19,13 @@ import mixin from '../../common/mixins/StopFinderMixin';
  *
  *
  * @see <a href="/example/ol-search">Openlayers search example</a>
- *
- * @extends {Control}
- * @implements {StopFinderInterface}
  */
-class StopFinderControl extends mixin(Control) {
+class StopFinderControl extends StopFinderControlCommon {
     /**
      * @private
      */
-    onSuggestionClick({ geometry }) {
-        const coord = fromLonLat(geometry.coordinates);
+    onSuggestionClick(suggestion) {
+        const coord = fromLonLat(suggestion.geometry.coordinates);
         this.map.getView().setCenter(coord);
     }
 }

package/ol/layers/Layer.d.ts

@@ -1,4 +1,25 @@
-export default Layer;
+import { Map } from 'ol';
+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 { AnyMap, UserInteractionCallback } from '../../types';
+export declare type OlLayerOptions = {
+    key?: string;
+    name?: string;
+    group?: string;
+    copyrights?: string[];
+    children?: Layer[];
+    visible?: boolean;
+    disabled?: Boolean;
+    hitTolerance?: Number;
+    properties?: {
+        [x: string]: any;
+    };
+    map?: AnyMap;
+    olLayer: OlLayer | LayerGroup;
+};
+declare const Layer_base: typeof LayerCommon;
 /**
  * A class representing a layer to display on an OpenLayers map.
  *
@@ -12,38 +33,65 @@ export default Layer;
  * @see <a href="/example/ol-map">Map example</a>
  *
  * @classproperty {ol/Map~Map} map - The map where the layer is displayed.
- * @extends {Layer}
+ * @extends {LayerCommon}
  */
-declare class Layer {
+declare class Layer extends Layer_base {
+    olLayer?: OlLayer;
+    olListenersKeys: EventsKey[];
+    options: OlLayerOptions;
+    visible: boolean;
+    copyrights: string[];
+    map?: Map;
+    userInteractions?: boolean;
+    userClickInteractions?: boolean;
+    userHoverInteractions?: boolean;
+    userClickCallbacks?: UserInteractionCallback[];
+    userHoverCallbacks?: UserInteractionCallback[];
+    onUserClickCallback: () => void;
+    singleClickListenerKey: EventsKey;
+    pointerMoveListenerKey: EventsKey;
+    onUserMoveCallback: () => void;
+    /**
+     * Constructor.
+     *
+     * @param {LayerCommonOptions} options
+     * @param {ol/layer/Layer~Layer} options.olLayer The layer (required).
+     * @param {string} [options.name=uuid()] Layer name. Default use a generated uuid.
+     * @param {string} [options.key=uuid().toLowerCase()] Layer key, will use options.name.toLowerCase() if not specified.
+     * @param {string} [options.copyright=undefined] Copyright-Statement.
+     * @param {Array<Layer>} [options.children=[]] Sublayers.
+     * @param {Object} [options.properties={}] Application-specific layer properties.
+     * @param {boolean} [options.visible=true] If true this layer is the currently visible layer on the map.
+     */
+    constructor(options: OlLayerOptions);
     /**
      * Define layer's properties.
      *
      * @ignore
      */
-    defineProperties(options: any): void;
+    defineProperties(options: OlLayerOptions): void;
     /**
      * Initialize the layer and listen to feature clicks.
      * @param {ol/Map~Map} map
      */
-    attachToMap(map: any): void;
+    attachToMap(map: Map): void;
     /**
      * Terminate what was initialized in init function. Remove layer, events...
      */
     detachFromMap(): void;
     activateUserInteractions(): void;
-    singleClickListenerKey: any;
-    pointerMoveListenerKey: any;
     deactivateUserInteractions(): void;
     /**
      * Toggle listeners needed when a layer is avisible or not.
      * @private
      */
-    private toggleVisibleListeners;
+    toggleVisibleListeners(): void;
     /**
      * Create a copy of the Layer.
      * @param {Object} newOptions Options to override
      * @return {Layer} A Layer
      */
-    clone(newOptions: Object): Layer;
+    clone(newOptions: OlLayerOptions): Layer;
 }
+export default Layer;
 //# sourceMappingURL=Layer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/Layer.js"],"names":[],"mappings":";AAIA;;;;;;;;;;;;;;GAcG;AACH;IAqBE;;;;OAIG;IACH,qCAQC;IAED;;;OAGG;IACH,4BAiDC;IAED;;OAEG;IACH,sBAYC;IAED,iCAyBC;IAjBG,4BAGC;IASD,4BAGC;IAIL,mCAEC;IAED;;;OAGG;IACH,+BAMC;IAED;;;;OAIG;IACH,kBAHW,MAAM,GACL,KAAK,CAIhB;CACF"}
+{"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,MAAM,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEnE,oBAAY,cAAc,GAAG;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAClC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,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;IAIV,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,sBAAsB,EAAG,SAAS,CAAC;IAEnC,sBAAsB,EAAG,SAAS,CAAC;IAEnC,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"}

package/ol/layers/Layer.js

@@ -1,5 +1,5 @@
 import { unByKey } from 'ol/Observable';
-import LayerCommon from '../../common/layers/Layer';
+import LayerCommon from '../../common/layers/LayerCommon';
 import userInteractionsMixin from '../../common/mixins/UserInteractionsLayerMixin';
 /**
  * A class representing a layer to display on an OpenLayers map.
@@ -14,13 +14,13 @@ import userInteractionsMixin from '../../common/mixins/UserInteractionsLayerMixi
  * @see <a href="/example/ol-map">Map example</a>
  *
  * @classproperty {ol/Map~Map} map - The map where the layer is displayed.
- * @extends {Layer}
+ * @extends {LayerCommon}
  */
 class Layer extends userInteractionsMixin(LayerCommon) {
     /**
      * Constructor.
      *
-     * @param {Object} options
+     * @param {LayerCommonOptions} options
      * @param {ol/layer/Layer~Layer} options.olLayer The layer (required).
      * @param {string} [options.name=uuid()] Layer name. Default use a generated uuid.
      * @param {string} [options.key=uuid().toLowerCase()] Layer key, will use options.name.toLowerCase() if not specified.
@@ -63,7 +63,9 @@ class Layer extends userInteractionsMixin(LayerCommon) {
             !((_c = (_b = (_a = this.map) === null || _a === void 0 ? void 0 : _a.getLayers()) === null || _b === void 0 ? void 0 : _b.getArray()) === null || _c === void 0 ? void 0 : _c.includes(this.olLayer))) {
             this.map.addLayer(this.olLayer);
         }
-        this.olListenersKeys.push(this.on('change:visible', () => {
+        this.olListenersKeys.push(
+        // @ts-ignore
+        this.on('change:visible', () => {
             if (this.olLayer) {
                 this.olLayer.setVisible(this.visible);
             }
@@ -74,7 +76,9 @@ class Layer extends userInteractionsMixin(LayerCommon) {
             }
         }));
         this.toggleVisibleListeners();
-        this.olListenersKeys.push(this.on('change:visible', this.toggleVisibleListeners));
+        this.olListenersKeys.push(
+        // @ts-ignore
+        this.on('change:visible', this.toggleVisibleListeners));
         // We set the copyright to the source used by the layer.
         if (this.copyrights && this.olLayer) {
             const attributions = this.copyrights || [];
@@ -84,7 +88,11 @@ class Layer extends userInteractionsMixin(LayerCommon) {
                     .getArray()
                     .forEach((layer) => {
                     var _a;
-                    (_a = layer.getSource()) === null || _a === void 0 ? void 0 : _a.setAttributions(attributions);
+                    // @ts-ignore
+                    if (layer.getSource) {
+                        // @ts-ignore
+                        (_a = layer.getSource()) === null || _a === void 0 ? void 0 : _a.setAttributions(attributions);
+                    }
                 });
             }
             else if (this.olLayer.getSource) {
@@ -106,18 +114,19 @@ class Layer extends userInteractionsMixin(LayerCommon) {
         super.detachFromMap();
     }
     activateUserInteractions() {
+        var _a, _b;
         this.deactivateUserInteractions();
         if (this.map &&
             this.userInteractions &&
             this.userClickInteractions &&
-            this.userClickCallbacks.length) {
+            ((_a = this.userClickCallbacks) === null || _a === void 0 ? void 0 : _a.length)) {
             this.singleClickListenerKey = this.map.on('singleclick', this.onUserClickCallback);
             this.olListenersKeys.push(this.singleClickListenerKey);
         }
         if (this.map &&
             this.userInteractions &&
             this.userHoverInteractions &&
-            this.userHoverCallbacks.length) {
+            ((_b = this.userHoverCallbacks) === null || _b === void 0 ? void 0 : _b.length)) {
             this.pointerMoveListenerKey = this.map.on('pointermove', this.onUserMoveCallback);
         }
     }

package/ol/layers/MapGlLayer.d.ts

@@ -0,0 +1,67 @@
+/// <reference types="mapbox-gl" />
+import { RenderFunction } from 'ol/layer/Layer';
+import GeoJSON from 'ol/format/GeoJSON';
+import OlMap from 'ol/Map';
+import { Coordinate } from 'ol/coordinate';
+import { AnyMapboxMap, AnyMapboxMapClass, LayerGetFeatureInfoResponse } from '../../types';
+import Layer, { OlLayerOptions } from './Layer';
+export declare type MapGlLayerOptions = OlLayerOptions & {
+    url?: string;
+    apiKey?: string;
+    apiKeyName?: string;
+    mapOptions?: any;
+    tabIndex?: number;
+};
+/**
+ * Common class for Mapbox and Maplibre and potential other fork from Mapbox.
+ * It's used to share code between Mapbox and Maplibre layers without importing both libs.
+ */
+declare class MapGlLayer extends Layer {
+    mbMap?: AnyMapboxMap;
+    styleUrl?: string;
+    apiKey?: string;
+    apiKeyName: string;
+    format: GeoJSON;
+    loaded: boolean;
+    options: MapGlLayerOptions;
+    constructor(options: MapGlLayerOptions);
+    /**
+     * Initialize the layer and listen to feature clicks.
+     * @param {ol/Map~Map} map
+     */
+    attachToMap(map: OlMap): void;
+    /**
+     * Terminate what was initialized in init function. Remove layer, events...
+     */
+    detachFromMap(): void;
+    /**
+     * Create the mapbox map.
+     * @private
+     */
+    loadMbMap(): void;
+    /**
+     * Update attributions of the source.
+     * @private
+     */
+    updateAttribution(evt: maplibregl.MapLibreEvent | mapboxgl.MapboxEvent): void;
+    /**
+     * Request feature information for a given coordinate.
+     * @param {ol/coordinate~Coordinate} coordinate Coordinate to request the information at.
+     * @param {Object} options A [mapboxgl.Map#queryrenderedfeatures](https://docs.mapbox.com/mapbox-gl-js/api/map/#map#queryrenderedfeatures) options parameter.
+     * @return {Promise<FeatureInfo>} Promise with features, layer and coordinate. The original Mapbox feature is available as a property named 'mapboxFeature'.
+     */
+    getFeatureInfoAtCoordinate(coordinate: Coordinate, options: any): Promise<LayerGetFeatureInfoResponse>;
+    /**
+     * Return the render function function for the ol layer.
+     *
+     */
+    getOlLayerRender(): RenderFunction;
+    /**
+     * Return the Class to instanciate for the mapbox map.
+     *
+     * @return {mapboxgl.Map|maplibregl.Map} map
+     */
+    getMapboxMapClass(): AnyMapboxMapClass;
+}
+export default MapGlLayer;
+//# sourceMappingURL=MapGlLayer.d.ts.map

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

@@ -0,0 +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"}

package/{common/mixins/MapboxLayerMixin.js → ol/layers/MapGlLayer.js}

@@ -1,41 +1,20 @@
 /* eslint-disable max-classes-per-file */
 import { toLonLat } from 'ol/proj';
-import OLLayer from 'ol/layer/Layer';
+import OlLayer from 'ol/layer/Layer';
 import Source from 'ol/source/Source';
 import GeoJSON from 'ol/format/GeoJSON';
-import { getUrlWithParams, getMapboxMapCopyrights } from '../utils';
+import { getUrlWithParams, getMapboxMapCopyrights } from '../../common/utils';
+import Layer from './Layer';
 /**
- * MapboxLayerInterface
+ * Common class for Mapbox and Maplibre and potential other fork from Mapbox.
+ * It's used to share code between Mapbox and Maplibre layers without importing both libs.
  */
-export class MapboxLayerInterface {
-    /**
-     * Return the render function function for the ol layer.
-     *
-     */
-    // eslint-disable-next-line class-methods-use-this
-    getOlLayerRender() { }
-    /**
-     * Return the Class to instanciate for the mapbox map.
-     *
-     * @return {mapboxgl.Map|maplibregl.Map} map
-     */
-    // eslint-disable-next-line class-methods-use-this
-    getMapboxMapClass() { }
-}
-/**
- * Mixin for MapboxLayerLayerInterface.
- * It's used to share code between Mapbox and Maplibre layers without importing both libs
- *
- * @param {Class} Base A class to extend with {MapboxLayerLayerInterface} functionnalities.
- * @return {Class}  A class that implements {MapboxLayerLayerInterface} class and extends Base;
- * @private
- */
-const MapboxLayerMixin = (Base) => class extends Base {
-    constructor(options = {}) {
+class MapGlLayer extends Layer {
+    constructor(options) {
         super(options);
-        this.olLayer = new OLLayer({
+        this.olLayer = new OlLayer({
             source: new Source({}),
-            render: this.getOlLayerRender(this),
+            render: this.getOlLayerRender(),
         });
         /**
          * Url of the mapbox style.
@@ -88,7 +67,7 @@ const MapboxLayerMixin = (Base) => class extends Base {
             // to avoid display of errors we set an empty function.
             this.mbMap.triggerRepaint = () => { };
             this.mbMap.remove();
-            this.mbMap = null;
+            this.mbMap = undefined;
         }
         this.loaded = false;
         super.detachFromMap();
@@ -98,15 +77,20 @@ const MapboxLayerMixin = (Base) => class extends Base {
      * @private
      */
     loadMbMap() {
-        this.olListenersKeys.push(this.map.on('change:target', () => {
+        var _a, _b, _c;
+        this.olListenersKeys.push(
+        // @ts-ignore
+        (_a = this.map) === null || _a === void 0 ? void 0 : _a.on('change:target', () => {
             this.loadMbMap();
         }));
-        if (!this.map.getTargetElement()) {
+        if (!((_b = this.map) === null || _b === void 0 ? void 0 : _b.getTargetElement())) {
             return;
         }
         if (!this.visible) {
             // On next change of visibility we load the map
-            this.olListenersKeys.push(this.once('change:visible', () => {
+            this.olListenersKeys.push(
+            // @ts-ignore
+            this.once('change:visible', () => {
                 this.loadMbMap();
             }));
             return;
@@ -115,7 +99,12 @@ const MapboxLayerMixin = (Base) => class extends Base {
         container.style.position = 'absolute';
         container.style.width = '100%';
         container.style.height = '100%';
-        if (!this.apiKey && !this.styleUrl.includes(this.apiKeyName)) {
+        if (!this.styleUrl) {
+            // eslint-disable-next-line no-console
+            console.error(`No styleUrl defined for mapbox layer: ${this.styleUrl}`);
+            return;
+        }
+        if (!this.apiKey && !((_c = this.styleUrl) === null || _c === void 0 ? void 0 : _c.includes(this.apiKeyName))) {
             // eslint-disable-next-line no-console
             console.error(`No apiKey defined for mapbox layer with style url to ${this.styleUrl}`);
         }
@@ -133,6 +122,7 @@ const MapboxLayerMixin = (Base) => class extends Base {
              * @type {boolean}
              */
             this.loaded = true;
+            // @ts-ignore
             this.dispatchEvent({
                 type: 'load',
                 target: this,
@@ -145,11 +135,11 @@ const MapboxLayerMixin = (Base) => class extends Base {
      * @private
      */
     updateAttribution(evt) {
-        var _a, _b;
+        var _a, _b, _c;
         const newAttributions = getMapboxMapCopyrights(evt.target) || [];
         if (((_a = this.copyrights) === null || _a === void 0 ? void 0 : _a.toString()) !== newAttributions.toString()) {
             this.copyrights = newAttributions;
-            (_b = this.olLayer.getSource()) === null || _b === void 0 ? void 0 : _b.setAttributions(newAttributions);
+            (_c = (_b = this.olLayer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.setAttributions(newAttributions);
         }
     }
     /**
@@ -166,18 +156,27 @@ const MapboxLayerMixin = (Base) => class extends Base {
             !this.mbMap.isStyleLoaded()) {
             return Promise.resolve({ coordinate, features: [], layer: this });
         }
-        let pixel = coordinate && this.mbMap.project(toLonLat(coordinate));
+        const pixel = coordinate &&
+            this.mbMap.project(toLonLat(coordinate));
+        let pixels;
         if (this.hitTolerance) {
             const { x, y } = pixel;
-            pixel = [
-                { x: x - this.hitTolerance, y: y - this.hitTolerance },
-                { x: x + this.hitTolerance, y: y + this.hitTolerance },
+            pixels = [
+                {
+                    x: x - this.hitTolerance,
+                    y: y - this.hitTolerance,
+                },
+                {
+                    x: x + this.hitTolerance,
+                    y: y + this.hitTolerance,
+                },
             ];
         }
         // At this point we get GeoJSON Mapbox feature, we transform it to an OpenLayers
         // feature to be consistent with other layers.
         const features = this.mbMap
-            .queryRenderedFeatures(pixel, options)
+            // @ts-ignore
+            .queryRenderedFeatures(pixels || pixel, options)
             .map((feature) => {
             const olFeature = this.format.readFeature(feature);
             if (olFeature) {
@@ -194,5 +193,28 @@ const MapboxLayerMixin = (Base) => class extends Base {
             coordinate,
         });
     }
-};
-export default MapboxLayerMixin;
+    /**
+     * Return the render function function for the ol layer.
+     *
+     */
+    // eslint-disable-next-line class-methods-use-this
+    getOlLayerRender() {
+        // eslint-disable-next-line no-console
+        console.error('This function must be implemented in subclasses');
+        const div = document.createElement('div');
+        return () => div;
+    }
+    /**
+     * Return the Class to instanciate for the mapbox map.
+     *
+     * @return {mapboxgl.Map|maplibregl.Map} map
+     */
+    // eslint-disable-next-line class-methods-use-this
+    getMapboxMapClass() {
+        // eslint-disable-next-line no-console
+        console.error('This function must be implemented in subclasses');
+        // @ts-ignore
+        return null;
+    }
+}
+export default MapGlLayer;