mobility-toolbox-js 3.0.1-beta.8 → 3.1.0-beta.0

package/ol/layers/RealtimeLayer.d.ts

@@ -76,6 +76,7 @@ declare class RealtimeLayer extends Layer {
      */
     constructor(options: RealtimeLayerOptions);
     attachToMap(): void;
+    cleanVectorLayer(): void;
     /**
      * Create a copy of the RealtimeLayer.
      *
@@ -141,6 +142,7 @@ declare class RealtimeLayer extends Layer {
      */
     highlightTrajectory(id: RealtimeTrainId): Promise<Feature[] | undefined>;
     onMoveEnd(): void;
+    onRealtimeEngineIdle(): void;
     /**
      * Callback when the RealtimeEngine has rendered successfully.
      */

package/ol/layers/RealtimeLayer.js

@@ -106,7 +106,7 @@ class RealtimeLayer extends Layer {
         this.olEventsKeys = [];
         // For backward compatibility with v2
         defineDeprecatedProperties(this, options);
-        this.engine = new RealtimeEngine(Object.assign({ getViewState: this.getViewState.bind(this), onRender: this.onRealtimeEngineRender.bind(this) }, options));
+        this.engine = new RealtimeEngine(Object.assign({ getViewState: this.getViewState.bind(this), onIdle: this.onRealtimeEngineIdle.bind(this), onRender: this.onRealtimeEngineRender.bind(this) }, options));
         this.allowRenderWhenAnimating = !!options.allowRenderWhenAnimating;
         // We store the layer used to highlight the full Trajectory
         this.vectorLayer = new VectorLayer({
@@ -128,7 +128,11 @@ class RealtimeLayer extends Layer {
             if (this.getVisible()) {
                 this.engine.start();
             }
-            this.olEventsKeys.push(...mapInternal.on(['moveend', 'change:target'], 
+            this.olEventsKeys.push(mapInternal.on('movestart', () => {
+                if (this.engine.isUpdateBboxOnMoveEnd) {
+                    this.engine.updateIdleState();
+                }
+            }), ...mapInternal.on(['moveend', 'change:target'], 
             // @ts-expect-error  - bad ol definitions
             (evt) => {
                 const view = (evt.map || evt.target).getView();
@@ -157,6 +161,11 @@ class RealtimeLayer extends Layer {
             }));
         }
     }
+    cleanVectorLayer() {
+        var _a, _b, _c;
+        (_b = (_a = this.vectorLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.clear(true);
+        (_c = this.vectorLayer.getMapInternal()) === null || _c === void 0 ? void 0 : _c.removeLayer(this.vectorLayer);
+    }
     /**
      * Create a copy of the RealtimeLayer.
      *
@@ -259,29 +268,35 @@ class RealtimeLayer extends Layer {
      */
     highlightTrajectory(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);
-            (_c = this.vectorLayer.getMapInternal()) === null || _c === void 0 ? void 0 : _c.removeLayer(this.vectorLayer);
+            var _a, _b, _c, _d, _e, _f;
             if (!id) {
+                this.cleanVectorLayer();
                 return;
             }
             const features = yield this.getFullTrajectory(id);
             if (!(features === null || features === void 0 ? void 0 : features.length)) {
+                this.cleanVectorLayer();
                 return;
             }
             if (features.length) {
-                (_e = (_d = this.vectorLayer) === null || _d === void 0 ? void 0 : _d.getSource()) === null || _e === void 0 ? void 0 : _e.addFeatures(features);
+                (_b = (_a = this.vectorLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.addFeatures(features);
+            }
+            if (this.vectorLayer.getMapInternal() &&
+                this.vectorLayer.getMapInternal() !== this.getMapInternal()) {
+                (_c = this.vectorLayer.getMapInternal()) === null || _c === void 0 ? void 0 : _c.removeLayer(this.vectorLayer);
             }
             // 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);
+                if (!this.vectorLayer.getMapInternal()) {
+                    (_d = this.getMapInternal()) === null || _d === void 0 ? void 0 : _d.addLayer(this.vectorLayer);
+                }
             }
-            else {
-                const index = ((_g = this.getMapInternal()) === null || _g === void 0 ? void 0 : _g.getLayers().getArray().indexOf(this)) || 0;
+            else if (!this.vectorLayer.getMapInternal()) {
+                const index = ((_e = this.getMapInternal()) === null || _e === void 0 ? void 0 : _e.getLayers().getArray().indexOf(this)) || 0;
                 if (index) {
-                    (_h = this.getMapInternal()) === null || _h === void 0 ? void 0 : _h.getLayers().insertAt(index, this.vectorLayer);
+                    (_f = this.getMapInternal()) === null || _f === void 0 ? void 0 : _f.getLayers().insertAt(index, this.vectorLayer);
                 }
             }
             return features;
@@ -293,6 +308,9 @@ class RealtimeLayer extends Layer {
         }
         this.engine.setBbox();
     }
+    onRealtimeEngineIdle() {
+        this.changed();
+    }
     /**
      * Callback when the RealtimeEngine has rendered successfully.
      */

package/ol/renderers/RealtimeLayerRenderer.js

@@ -55,8 +55,10 @@ export default class RealtimeLayerRenderer extends CanvasLayerRenderer {
         return true;
     }
     renderFrame(frameState) {
-        const { canvas, renderedViewState } = this.getLayer();
+        var _a;
+        const { canvas, engine, renderedViewState } = this.getLayer();
         this.getLayer().engine.pixelRatio = frameState.pixelRatio;
+        this.ready = !!((_a = engine.renderState) === null || _a === void 0 ? void 0 : _a.renderedTrajectories) && engine.isIdle;
         if (!this.container) {
             this.container = document.createElement('div');
             this.container.className = this.getLayer().getClassName();

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.8",
+  "version": "3.1.0-beta.0",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "exports": {
     ".": "./index.js",