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

package/mbt.js

@@ -47443,11 +47443,6 @@ uniform ${i3} ${a3} u_${s3};
         if (this.getVisible()) {
           this.engine.start();
         }
-        const index = mapInternal.getLayers().getArray().indexOf(this);
-        if (this.vectorLayer.getMapInternal() === mapInternal) {
-          this.getMapInternal()?.removeLayer(this.vectorLayer);
-        }
-        mapInternal.getLayers().insertAt(index, this.vectorLayer);
         this.olEventsKeys.push(
           ...mapInternal.on(
             ["moveend", "change:target"],
@@ -47482,6 +47477,10 @@ uniform ${i3} ${a3} u_${s3};
         );
       }
     }
+    cleanVectorLayer() {
+      this.vectorLayer?.getSource()?.clear(true);
+      this.vectorLayer.getMapInternal()?.removeLayer(this.vectorLayer);
+    }
     /**
      * Create a copy of the RealtimeLayer.
      *
@@ -47504,29 +47503,49 @@ uniform ${i3} ${a3} u_${s3};
       this.engine.detachFromMap();
     }
     /**
-     * Get some informations about a trajectory.
+     * Get the full trajectory of a vehicle as features.
      *
-     * @param {RealtimeTrainId} id A vehicle's id.
-     * @returns
-     */
-    getTrajectoryInfos(id) {
-      const promises = [
-        this.engine.api.getStopSequence(id),
-        this.engine.api.getFullTrajectory(
-          id,
-          this.engine.mode,
-          this.engine.getGeneralizationLevelByZoom(
-            Math.floor(this.getMapInternal()?.getView()?.getZoom() || 0)
-          )
+     * @param {string} id A vehicle's id.
+     * @returns {Promise<Feature[]>} A list of features representing a full trajectory.
+     * @public
+     */
+    async getFullTrajectory(id) {
+      const data = await this.engine.api.getFullTrajectory(
+        id,
+        this.engine.mode,
+        this.engine.getGeneralizationLevelByZoom(
+          Math.floor(this.getMapInternal()?.getView()?.getZoom() || 0)
         )
-      ];
-      return Promise.all(promises).then(([stopSequence, fullTrajectory]) => {
-        const response = {
-          fullTrajectory,
-          stopSequence
-        };
-        return response;
-      });
+      );
+      if (data?.content?.features?.length) {
+        return format2.readFeatures(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
+     */
+    async getStopSequences(id) {
+      const data = await this.engine.api.getStopSequence(id);
+      return data?.content;
+    }
+    /**
+     * Get full trajectory and stop sequences  of a vehicle.
+     *
+     * @param {RealtimeTrainId} id A vehicle's id.
+     * @returns {Promise<{fullTrajectory: Feature[], stopSequences: RealtimeStopSequence[]}>} An object containing the full trajectory and the stop sequences.
+     */
+    async getTrajectoryInfos(id) {
+      const promises = [this.getStopSequences(id), this.getFullTrajectory(id)];
+      const [stopSequences, fullTrajectory] = await Promise.all(promises);
+      return {
+        fullTrajectory,
+        stopSequences
+      };
     }
     getVehicles(filterFunc) {
       return this.engine.getVehicles(filterFunc);
@@ -47558,32 +47577,35 @@ uniform ${i3} ${a3} u_${s3};
     /**
      * Highlight the trajectory of journey.
      */
-    highlightTrajectory(id) {
+    async highlightTrajectory(id) {
       if (!id) {
-        this.vectorLayer?.getSource()?.clear(true);
-        return Promise.resolve([]);
+        this.cleanVectorLayer();
+        return;
       }
-      return this.engine.api.getFullTrajectory(
-        id,
-        this.engine.mode,
-        this.engine.getGeneralizationLevelByZoom(
-          Math.floor(this.getMapInternal()?.getView()?.getZoom() || 0)
-        )
-      ).then((data) => {
-        const fullTrajectory = data.content;
-        if (!fullTrajectory?.features?.length) {
-          return [];
+      const features = await this.getFullTrajectory(id);
+      if (!features?.length) {
+        this.cleanVectorLayer();
+        return;
+      }
+      if (features.length) {
+        this.vectorLayer?.getSource()?.addFeatures(features);
+      }
+      if (this.vectorLayer.getMapInternal() && this.vectorLayer.getMapInternal() !== this.getMapInternal()) {
+        this.vectorLayer.getMapInternal()?.removeLayer(this.vectorLayer);
+      }
+      const zIndex = this.getZIndex();
+      if (zIndex !== void 0) {
+        this.vectorLayer.setZIndex(zIndex - 1);
+        if (!this.vectorLayer.getMapInternal()) {
+          this.getMapInternal()?.addLayer(this.vectorLayer);
         }
-        const features = format2.readFeatures(fullTrajectory);
-        this.vectorLayer?.getSource()?.clear(true);
-        if (features.length) {
-          this.vectorLayer?.getSource()?.addFeatures(features);
+      } else if (!this.vectorLayer.getMapInternal()) {
+        const index = this.getMapInternal()?.getLayers().getArray().indexOf(this) || 0;
+        if (index) {
+          this.getMapInternal()?.getLayers().insertAt(index, this.vectorLayer);
         }
-        return features;
-      }).catch(() => {
-        this.vectorLayer?.getSource()?.clear(true);
-        return [];
-      });
+      }
+      return features;
     }
     onMoveEnd() {
       if (!this.engine.isUpdateBboxOnMoveEnd || !this.getVisible()) {