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

package/ol/layers/WMSLayer.d.ts

@@ -1,4 +1,10 @@
-export default WMSLayer;
+import { Coordinate } from 'ol/coordinate';
+import GeoJSON from 'ol/format/GeoJSON';
+import ImageLayer from 'ol/layer/Image';
+import TileLayer from 'ol/layer/Tile';
+import { ImageWMS, TileWMS } from 'ol/source';
+import { LayerGetFeatureInfoResponse } from '../../types';
+import Layer, { OlLayerOptions } from './Layer';
 /**
  * Class use to display a WMS layer.
  *
@@ -6,33 +12,31 @@ export default WMSLayer;
  * @extends {Layer}
  */
 declare class WMSLayer extends Layer {
+    abortController?: AbortController;
+    format: GeoJSON;
+    olLayer?: TileLayer<TileWMS> | ImageLayer<ImageWMS>;
     /**
      * @override
      */
-    constructor(options?: {});
-    /** @ignore */
-    abortController: AbortController;
-    /** @ignore */
-    format: GeoJSON;
+    constructor(options: OlLayerOptions);
     /**
      * Get features infos' Url.
      * @param {ol/coordinate~Coordinate} coord
      * @return {ol/layer/Layer~Layer}
      */
-    getFeatureInfoUrl(coord: any): ol;
+    getFeatureInfoUrl(coord: Coordinate): string | undefined;
     /**
      * Request feature information for a given coordinate.
      * @param {ol/coordinate~Coordinate} coordinate to request the information at.
      * @return {Promise<FeatureInfo>} Promise with features, layer and coordinate.
      */
-    getFeatureInfoAtCoordinate(coordinate: any): Promise<FeatureInfo>;
+    getFeatureInfoAtCoordinate(coordinate: Coordinate): Promise<LayerGetFeatureInfoResponse>;
     /**
      * Create a copy of the WMSLayer.
      * @param {Object} newOptions Options to override
      * @return {WMSLayer} A WMSLayer
      */
-    clone(newOptions: Object): WMSLayer;
+    clone(newOptions: OlLayerOptions): WMSLayer;
 }
-import Layer from "./Layer";
-import GeoJSON from "ol/format/GeoJSON";
+export default WMSLayer;
 //# sourceMappingURL=WMSLayer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"WMSLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/WMSLayer.js"],"names":[],"mappings":";AAGA;;;;;GAKG;AACH;IACE;;OAEG;IACH,0BAOC;IAJC,cAAc;IACd,iCAA4C;IAC5C,cAAc;IACd,gBAA2B;IAG7B;;;;OAIG;IACH,kCAaC;IAED;;;;OAIG;IACH,6CAFY,QAAQ,WAAW,CAAC,CAsB/B;IAED;;;;OAIG;IACH,kBAHW,MAAM,GACL,QAAQ,CAInB;CACF"}
+{"version":3,"file":"WMSLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/WMSLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,UAAU,MAAM,gBAAgB,CAAC;AACxC,OAAO,SAAS,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,EAAE,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEhD;;;;;GAKG;AACH,cAAM,QAAS,SAAQ,KAAK;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;IAElC,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IAEpD;;OAEG;gBACS,OAAO,EAAE,cAAc;IASnC;;;;OAIG;IACH,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS;IAuBxD;;;;OAIG;IACH,0BAA0B,CACxB,UAAU,EAAE,UAAU,GACrB,OAAO,CAAC,2BAA2B,CAAC;IAkCvC;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,cAAc;CAGjC;AAED,eAAe,QAAQ,CAAC"}

package/ol/layers/WMSLayer.js

@@ -10,7 +10,7 @@ class WMSLayer extends Layer {
     /**
      * @override
      */
-    constructor(options = {}) {
+    constructor(options) {
         super(options);
         /** @ignore */
         this.abortController = new AbortController();
@@ -23,17 +23,21 @@ class WMSLayer extends Layer {
      * @return {ol/layer/Layer~Layer}
      */
     getFeatureInfoUrl(coord) {
+        var _a, _b, _c, _d, _e, _f;
+        if (!this.map) {
+            return;
+        }
         const projection = this.map.getView().getProjection();
         const resolution = this.map.getView().getResolution();
-        if (this.olLayer.getSource().getFeatureInfoUrl) {
-            return this.olLayer
-                .getSource()
-                .getFeatureInfoUrl(coord, resolution, projection, {
+        if (resolution &&
+            projection &&
+            ((_b = (_a = this.olLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.getFeatureInfoUrl)) {
+            // eslint-disable-next-line consistent-return
+            return (_d = (_c = this.olLayer) === null || _c === void 0 ? void 0 : _c.getSource()) === null || _d === void 0 ? void 0 : _d.getFeatureInfoUrl(coord, resolution, projection, {
                 info_format: 'application/json',
-                query_layers: this.olLayer.getSource().getParams().layers,
+                query_layers: (_f = (_e = this.olLayer) === null || _e === void 0 ? void 0 : _e.getSource()) === null || _f === void 0 ? void 0 : _f.getParams().layers,
             });
         }
-        return false;
     }
     /**
      * Request feature information for a given coordinate.
@@ -41,10 +45,22 @@ class WMSLayer extends Layer {
      * @return {Promise<FeatureInfo>} Promise with features, layer and coordinate.
      */
     getFeatureInfoAtCoordinate(coordinate) {
-        this.abortController.abort();
+        var _a;
+        (_a = this.abortController) === null || _a === void 0 ? void 0 : _a.abort();
         this.abortController = new AbortController();
         const { signal } = this.abortController;
-        return fetch(this.getFeatureInfoUrl(coordinate), { signal })
+        const url = this.getFeatureInfoUrl(coordinate);
+        if (!url) {
+            // eslint-disable-next-line no-console
+            console.error('No url for the WMS layer.');
+            // resolve an empty feature array something fails
+            return Promise.resolve({
+                features: [],
+                coordinate,
+                layer: this,
+            });
+        }
+        return fetch(url, { signal })
             .then((resp) => resp.json())
             .then((r) => r.features)
             .then((data) => ({

package/ol/styles/fullTrajectoryDelayStyle.d.ts

@@ -1,4 +1,4 @@
+import { Style } from 'ol/style';
+declare const fullTrajectoryDelaystyle: () => Style[];
 export default fullTrajectoryDelaystyle;
-declare function fullTrajectoryDelaystyle(): Style[];
-import { Style } from "ol/style";
 //# sourceMappingURL=fullTrajectoryDelayStyle.d.ts.map

package/ol/styles/fullTrajectoryDelayStyle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fullTrajectoryDelayStyle.d.ts","sourceRoot":"","sources":["../../../src/ol/styles/fullTrajectoryDelayStyle.js"],"names":[],"mappings":";AAgCA,qDAEC"}
+{"version":3,"file":"fullTrajectoryDelayStyle.d.ts","sourceRoot":"","sources":["../../../src/ol/styles/fullTrajectoryDelayStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAwB,MAAM,UAAU,CAAC;AAgCvD,QAAA,MAAM,wBAAwB,QAAO,KAAK,EAEzC,CAAC;AAEF,eAAe,wBAAwB,CAAC"}

package/ol/styles/fullTrajectoryStyle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fullTrajectoryStyle.d.ts","sourceRoot":"","sources":["../../../src/ol/styles/fullTrajectoryStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAwB,MAAM,UAAU,CAAC;AAiBvD,QAAA,MAAM,mBAAmB,YACd,OAAO,cACJ,MAAM,WACT,GAAG,YAiCb,CAAC;AACF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"fullTrajectoryStyle.d.ts","sourceRoot":"","sources":["../../../src/ol/styles/fullTrajectoryStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAwB,MAAM,UAAU,CAAC;AAiBvD,QAAA,MAAM,mBAAmB,YACd,OAAO,cACJ,MAAM,WACT,GAAG,KACX,KAAK,EAgCP,CAAC;AACF,eAAe,mBAAmB,CAAC"}

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": "2.0.0-beta.47",
+  "version": "2.0.0-beta.49",
   "main": "index.js",
   "exports": {
     ".": "./index.js",

package/types/common.d.ts

@@ -10,6 +10,7 @@ import type {
 import type {
   CopyrightControl as OlCopyrightControl,
   MapboxLayer,
+  MaplibreLayer,
   RealtimeLayer as OlRealtimeLayer,
   layer as OlLayer,
 } from '../ol';

package/mapbox/utils.d.ts

@@ -1,8 +0,0 @@
-export function getMercatorResolution(map: mapboxgl.Map): number;
-export function getSourceCoordinates(map: mapboxgl.Map, pixelRatio: any): number[][];
-declare namespace _default {
-    export { getMercatorResolution };
-    export { getSourceCoordinates };
-}
-export default _default;
-//# sourceMappingURL=utils.d.ts.map

package/mapbox/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/mapbox/utils.js"],"names":[],"mappings":"AAQO,2CAHI,YAAY,UAYtB;AAOM,0CAHI,YAAY,+BAmBtB"}