mobility-toolbox-js 3.1.0-beta.1 → 3.1.0

package/ol/layers/Layer.d.ts

@@ -11,9 +11,7 @@ export type MobilityLayerOptions = {
     key?: string;
     map?: Map;
     name?: string;
-    properties?: Record<string, any>;
-    visible?: boolean;
-} & Options & Record<string, any>;
+} & Options & Record<string, unknown>;
 /**
  * An OpenLayers layer here only for backward compatibility v2.
  * @deprecated Use an OpenLayers Layer instead.

package/ol/layers/MaplibreStyleLayer.d.ts

@@ -7,6 +7,7 @@ import { ObjectEvent } from 'ol/Object';
 import { FilterFunction } from '../../common/typedefs';
 import { LayerGetFeatureInfoResponse } from '../../types';
 import MaplibreStyleLayerRenderer from '../renderers/MaplibreStyleLayerRenderer';
+import { MobilityLayerOptions } from './Layer';
 import MaplibreLayer, { MaplibreLayerOptions } from './MaplibreLayer';
 export type MaplibreStyleLayerOptions = {
     beforeId?: string;
@@ -14,7 +15,7 @@ export type MaplibreStyleLayerOptions = {
     layersFilter?: FilterFunction;
     maplibreLayer?: MaplibreLayer;
     queryRenderedLayersFilter?: FilterFunction;
-} & MaplibreLayerOptions;
+} & MaplibreLayerOptions & MobilityLayerOptions;
 /**
  * Layer that helps show/hide a specific subset of style layers of a [MaplibreLayer](./MaplibreLayer.js~MaplibreLayer.html).
  *

package/ol/layers/MaplibreStyleLayer.js

@@ -128,7 +128,7 @@ class MaplibreStyleLayer extends Layer {
         /** Manage renamed property for backward compatibility with v2  */
         if (options.mapboxLayer) {
             deprecated('options.mapboxLayer is deprecated. Use options.maplibreLayer instead.');
-            // eslint-disable-next-line no-param-reassign
+            // @ts-expect-error - mapboxLayer is deprecated
             options.maplibreLayer = options.mapboxLayer;
             // eslint-disable-next-line no-param-reassign
             delete options.mapboxLayer;

package/ol/layers/RealtimeLayer.d.ts

@@ -12,11 +12,12 @@ import RealtimeEngine, { RealtimeEngineOptions } from '../../common/utils/Realti
 import { RealtimeAPI } from '../../maplibre';
 import { RealtimeMode, RealtimeRenderState, RealtimeStopSequence, RealtimeTrainId, ViewState } from '../../types';
 import RealtimeLayerRenderer from '../renderers/RealtimeLayerRenderer';
+import { MobilityLayerOptions } from './Layer';
 export type RealtimeLayerOptions = {
     allowRenderWhenAnimating?: boolean;
     fullTrajectoryStyle?: (feature: FeatureLike, resolution: number, options: any) => void;
     maxNbFeaturesRequested?: number;
-} & RealtimeEngineOptions;
+} & MobilityLayerOptions & RealtimeEngineOptions;
 /**
  * An OpenLayers layer able to display data from the [geOps Realtime API](https://developer.geops.io/apis/realtime/).
  *

package/ol/renderers/MaplibreLayerRenderer.d.ts

@@ -6,4 +6,5 @@ export default class MaplibreLayerRenderer extends MapLibreLayerRenderer {
     constructor(layer: MaplibreLayer);
     renderFrame(frameState: FrameState): HTMLElement;
     setIsReady(): void;
+    updateReadyState(): void;
 }

package/ol/renderers/MaplibreLayerRenderer.js

@@ -13,20 +13,20 @@ export default class MaplibreLayerRenderer extends MapLibreLayerRenderer {
         this.ignoreNextRender = false;
     }
     renderFrame(frameState) {
-        var _a, _b;
         const layer = this.getLayer();
         const { mapLibreMap } = layer;
         const map = layer.getMapInternal();
-        (_b = (_a = this.getLayer()) === null || _a === void 0 ? void 0 : _a.mapLibreMap) === null || _b === void 0 ? void 0 : _b.off('idle', this.setIsReady);
         if (!layer || !map || !mapLibreMap) {
             // @ts-expect-error - can return null
             return null;
         }
-        if (this.ignoreNextRender) {
+        if (this.ready && this.ignoreNextRender) {
             this.ignoreNextRender = false;
             return mapLibreMap === null || mapLibreMap === void 0 ? void 0 : mapLibreMap.getContainer();
         }
         this.ready = false;
+        this.ignoreNextRender = false;
+        this.updateReadyState();
         const container = super.renderFrame(frameState);
         // Mark the renderer as ready when the map is idle
         mapLibreMap === null || mapLibreMap === void 0 ? void 0 : mapLibreMap.once('idle', this.setIsReady);
@@ -39,4 +39,9 @@ export default class MaplibreLayerRenderer extends MapLibreLayerRenderer {
             this.getLayer().changed();
         }
     }
+    updateReadyState() {
+        var _a, _b, _c, _d;
+        (_b = (_a = this.getLayer()) === null || _a === void 0 ? void 0 : _a.mapLibreMap) === null || _b === void 0 ? void 0 : _b.off('idle', this.setIsReady);
+        (_d = (_c = this.getLayer()) === null || _c === void 0 ? void 0 : _c.mapLibreMap) === null || _d === void 0 ? void 0 : _d.once('idle', this.setIsReady);
+    }
 }

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.1.0-beta.1",
+  "version": "3.1.0",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "exports": {
     ".": "./index.js",
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
-    "@commitlint/cli": "19.6.0",
+    "@commitlint/cli": "19.6.1",
     "@commitlint/config-conventional": "19.6.0",
     "@geops/eslint-config-react": "^1.3.2",
     "@types/geojson": "7946.0.15",
@@ -37,8 +37,8 @@
     "@types/offscreencanvas": "2019.7.3",
     "@types/topojson": "3.2.6",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.18.0",
-    "@typescript-eslint/parser": "8.18.0",
+    "@typescript-eslint/eslint-plugin": "8.18.1",
+    "@typescript-eslint/parser": "8.18.1",
     "cypress": "13.16.1",
     "esbuild": "0.24.0",
     "esdoc": "1.1.0",
@@ -77,7 +77,7 @@
     "sort-json": "2.0.1",
     "standard-version": "9.5.0",
     "start-server-and-test": "2.0.9",
-    "stylelint": "16.11.0",
+    "stylelint": "16.12.0",
     "stylelint-config-recommended-scss": "14.1.0",
     "stylelint-config-standard": "36.0.1",
     "stylelint-scss": "6.10.0",