mobility-toolbox-js 3.0.1-beta.7 → 3.0.1-beta.8

package/ol/layers/RealtimeLayer.d.ts

@@ -7,11 +7,10 @@ import VectorLayer from 'ol/layer/Vector';
 import { ObjectEvent } from 'ol/Object';
 import { Vector as VectorSource } from 'ol/source';
 import { State } from 'ol/View';
-import { WebSocketAPIMessageEventData } from '../../api/WebSocketAPI';
 import { FilterFunction, SortFunction } from '../../common/typedefs';
 import RealtimeEngine, { RealtimeEngineOptions } from '../../common/utils/RealtimeEngine';
 import { RealtimeAPI } from '../../maplibre';
-import { RealtimeFullTrajectory, RealtimeMode, RealtimeRenderState, RealtimeTrainId, ViewState } from '../../types';
+import { RealtimeMode, RealtimeRenderState, RealtimeStopSequence, RealtimeTrainId, ViewState } from '../../types';
 import RealtimeLayerRenderer from '../renderers/RealtimeLayerRenderer';
 export type RealtimeLayerOptions = {
     allowRenderWhenAnimating?: boolean;
@@ -91,14 +90,30 @@ declare class RealtimeLayer extends Layer {
      */
     detachFromMap(): void;
     /**
-     * Get some informations about a trajectory.
+     * Get the full trajectory of a vehicle as features.
+     *
+     * @param {string} id A vehicle's id.
+     * @returns {Promise<Feature[]>} A list of features representing a full trajectory.
+     * @public
+     */
+    getFullTrajectory(id: RealtimeTrainId): Promise<Feature[]>;
+    /**
+     * Get the stop sequences of a vehicle.
+     *
+     * @param {string} id A vehicle's id.
+     * @returns {Promise<RealtimeStopSequence[]>} An array of stop sequences.
+     * @public
+     */
+    getStopSequences(id: RealtimeTrainId): Promise<RealtimeStopSequence[]>;
+    /**
+     * Get full trajectory and stop sequences  of a vehicle.
      *
      * @param {RealtimeTrainId} id A vehicle's id.
-     * @returns
+     * @returns {Promise<{fullTrajectory: Feature[], stopSequences: RealtimeStopSequence[]}>} An object containing the full trajectory and the stop sequences.
      */
     getTrajectoryInfos(id: RealtimeTrainId): Promise<{
-        fullTrajectory: WebSocketAPIMessageEventData<RealtimeFullTrajectory> | WebSocketAPIMessageEventData<import("../../types").RealtimeStopSequence[]>;
-        stopSequence: WebSocketAPIMessageEventData<RealtimeFullTrajectory> | WebSocketAPIMessageEventData<import("../../types").RealtimeStopSequence[]>;
+        fullTrajectory: Feature[];
+        stopSequences: RealtimeStopSequence[];
     }>;
     getVehicles(filterFunc: FilterFunction): import("../../types").RealtimeTrajectory[];
     getViewState(): {

package/ol/layers/RealtimeLayer.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import debounce from 'lodash.debounce';
 import GeoJSON from 'ol/format/GeoJSON';
 import Layer from 'ol/layer/Layer';
@@ -112,7 +121,6 @@ class RealtimeLayer extends Layer {
         this.onMoveEndDebounced = debounce(this.onMoveEnd, 100);
     }
     attachToMap() {
-        var _a;
         this.engine.attachToMap();
         const mapInternal = this.getMapInternal();
         if (mapInternal) {
@@ -120,11 +128,6 @@ class RealtimeLayer extends Layer {
             if (this.getVisible()) {
                 this.engine.start();
             }
-            const index = mapInternal.getLayers().getArray().indexOf(this);
-            if (this.vectorLayer.getMapInternal() === mapInternal) {
-                (_a = this.getMapInternal()) === null || _a === void 0 ? void 0 : _a.removeLayer(this.vectorLayer);
-            }
-            mapInternal.getLayers().insertAt(index, this.vectorLayer);
             this.olEventsKeys.push(...mapInternal.on(['moveend', 'change:target'], 
             // @ts-expect-error  - bad ol definitions
             (evt) => {
@@ -177,25 +180,51 @@ class RealtimeLayer extends Layer {
         this.engine.detachFromMap();
     }
     /**
-     * Get some informations about a trajectory.
+     * Get the full trajectory of a vehicle as features.
+     *
+     * @param {string} id A vehicle's id.
+     * @returns {Promise<Feature[]>} A list of features representing a full trajectory.
+     * @public
+     */
+    getFullTrajectory(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            const data = yield this.engine.api.getFullTrajectory(id, this.engine.mode, this.engine.getGeneralizationLevelByZoom(Math.floor(((_b = (_a = this.getMapInternal()) === null || _a === void 0 ? void 0 : _a.getView()) === null || _b === void 0 ? void 0 : _b.getZoom()) || 0)));
+            if ((_d = (_c = data === null || data === void 0 ? void 0 : data.content) === null || _c === void 0 ? void 0 : _c.features) === null || _d === void 0 ? void 0 : _d.length) {
+                return format.readFeatures(data === null || data === void 0 ? void 0 : data.content);
+            }
+            return [];
+        });
+    }
+    /**
+     * Get the stop sequences of a vehicle.
+     *
+     * @param {string} id A vehicle's id.
+     * @returns {Promise<RealtimeStopSequence[]>} An array of stop sequences.
+     * @public
+     */
+    getStopSequences(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = yield this.engine.api.getStopSequence(id);
+            return data === null || data === void 0 ? void 0 : data.content;
+        });
+    }
+    /**
+     * Get full trajectory and stop sequences  of a vehicle.
      *
      * @param {RealtimeTrainId} id A vehicle's id.
-     * @returns
+     * @returns {Promise<{fullTrajectory: Feature[], stopSequences: RealtimeStopSequence[]}>} An object containing the full trajectory and the stop sequences.
      */
     getTrajectoryInfos(id) {
-        var _a, _b;
-        // When a vehicle is selected, we request the complete stop sequence and the complete full trajectory.
-        // Then we combine them in one response and send them to inherited layers.
-        const promises = [
-            this.engine.api.getStopSequence(id),
-            this.engine.api.getFullTrajectory(id, this.engine.mode, this.engine.getGeneralizationLevelByZoom(Math.floor(((_b = (_a = this.getMapInternal()) === null || _a === void 0 ? void 0 : _a.getView()) === null || _b === void 0 ? void 0 : _b.getZoom()) || 0))),
-        ];
-        return Promise.all(promises).then(([stopSequence, fullTrajectory]) => {
-            const response = {
-                fullTrajectory,
-                stopSequence,
+        return __awaiter(this, void 0, void 0, function* () {
+            // When a vehicle is selected, we request the complete stop sequence and the complete full trajectory.
+            // Then we combine them in one response.
+            const promises = [this.getStopSequences(id), this.getFullTrajectory(id)];
+            const [stopSequences, fullTrajectory] = yield Promise.all(promises);
+            return {
+                fullTrajectory: fullTrajectory,
+                stopSequences: stopSequences,
             };
-            return response;
         });
     }
     getVehicles(filterFunc) {
@@ -229,30 +258,33 @@ class RealtimeLayer extends Layer {
      * Highlight the trajectory of journey.
      */
     highlightTrajectory(id) {
-        var _a, _b, _c, _d;
-        if (!id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             (_b = (_a = this.vectorLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.clear(true);
-            return Promise.resolve([]);
-        }
-        return this.engine.api
-            .getFullTrajectory(id, this.engine.mode, this.engine.getGeneralizationLevelByZoom(Math.floor(((_d = (_c = this.getMapInternal()) === null || _c === void 0 ? void 0 : _c.getView()) === null || _d === void 0 ? void 0 : _d.getZoom()) || 0)))
-            .then((data) => {
-            var _a, _b, _c, _d, _e;
-            const fullTrajectory = data.content;
-            if (!((_a = fullTrajectory === null || fullTrajectory === void 0 ? void 0 : fullTrajectory.features) === null || _a === void 0 ? void 0 : _a.length)) {
-                return [];
+            (_c = this.vectorLayer.getMapInternal()) === null || _c === void 0 ? void 0 : _c.removeLayer(this.vectorLayer);
+            if (!id) {
+                return;
+            }
+            const features = yield this.getFullTrajectory(id);
+            if (!(features === null || features === void 0 ? void 0 : features.length)) {
+                return;
             }
-            const features = format.readFeatures(fullTrajectory);
-            (_c = (_b = this.vectorLayer) === null || _b === void 0 ? void 0 : _b.getSource()) === null || _c === void 0 ? void 0 : _c.clear(true);
             if (features.length) {
                 (_e = (_d = this.vectorLayer) === null || _d === void 0 ? void 0 : _d.getSource()) === null || _e === void 0 ? void 0 : _e.addFeatures(features);
             }
+            // Add the vector layer to the map
+            const zIndex = this.getZIndex();
+            if (zIndex !== undefined) {
+                this.vectorLayer.setZIndex(zIndex - 1);
+                (_f = this.getMapInternal()) === null || _f === void 0 ? void 0 : _f.addLayer(this.vectorLayer);
+            }
+            else {
+                const index = ((_g = this.getMapInternal()) === null || _g === void 0 ? void 0 : _g.getLayers().getArray().indexOf(this)) || 0;
+                if (index) {
+                    (_h = this.getMapInternal()) === null || _h === void 0 ? void 0 : _h.getLayers().insertAt(index, this.vectorLayer);
+                }
+            }
             return features;
-        })
-            .catch(() => {
-            var _a, _b;
-            (_b = (_a = this.vectorLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.clear(true);
-            return [];
         });
     }
     onMoveEnd() {

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.1-beta.7",
+  "version": "3.0.1-beta.8",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "exports": {
     ".": "./index.js",
@@ -29,7 +29,7 @@
     "@commitlint/cli": "19.6.0",
     "@commitlint/config-conventional": "19.6.0",
     "@geops/eslint-config-react": "^1.3.2",
-    "@types/geojson": "7946.0.14",
+    "@types/geojson": "7946.0.15",
     "@types/lodash": "^4.17.13",
     "@types/lodash.debounce": "4.0.9",
     "@types/lodash.throttle": "4.1.9",
@@ -37,8 +37,8 @@
     "@types/offscreencanvas": "2019.7.3",
     "@types/topojson": "3.2.6",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.17.0",
-    "@typescript-eslint/parser": "8.17.0",
+    "@typescript-eslint/eslint-plugin": "8.18.0",
+    "@typescript-eslint/parser": "8.18.0",
     "cypress": "13.16.1",
     "esbuild": "0.24.0",
     "esdoc": "1.1.0",
@@ -57,7 +57,7 @@
     "eslint-plugin-react": "7.37.2",
     "fixpack": "4.0.0",
     "husky": "9.1.7",
-    "is-ci": "3.0.1",
+    "is-ci": "4.1.0",
     "jest": "29.7.0",
     "jest-canvas-mock": "2.5.2",
     "jest-environment-jsdom": "29.7.0",
@@ -65,7 +65,7 @@
     "jest-serializer-html": "7.1.0",
     "jest-transformer-svg": "2.0.2",
     "jest-websocket-mock": "2.5.0",
-    "lint-staged": "15.2.10",
+    "lint-staged": "15.2.11",
     "maplibre-gl": "4.7.1",
     "mock-socket": "9.3.1",
     "next": "15.0.3",
@@ -76,14 +76,14 @@
     "raw-loader": "4.0.2",
     "sort-json": "2.0.1",
     "standard-version": "9.5.0",
-    "start-server-and-test": "2.0.8",
+    "start-server-and-test": "2.0.9",
     "stylelint": "16.11.0",
     "stylelint-config-recommended-scss": "14.1.0",
     "stylelint-config-standard": "36.0.1",
     "stylelint-scss": "6.10.0",
     "ts-jest": "^29.2.5",
     "typescript": "5.7.2",
-    "vite": "^6.0.2"
+    "vite": "^6.0.3"
   },
   "scripts": {
     "apidoc": "esdoc && cp apidoc/index.json doc/src/components/Esdoc",