mobility-toolbox-js 3.0.1-beta.4 → 3.0.1-beta.6

package/common/utils/RealtimeEngine.d.ts

@@ -68,7 +68,6 @@ declare class RealtimeEngine {
     getGeneralizationLevelByZoom: (zoom: number) => RealtimeGeneralizationLevel;
     getMotsByZoom: (zoom: number) => RealtimeMot[];
     getRenderTimeIntervalByZoom: (zoom: number) => number;
-    getViewState: () => ViewState;
     hoverVehicleId?: RealtimeTrainId;
     isUpdateBboxOnMoveEnd: boolean;
     live?: boolean;
@@ -84,7 +83,6 @@ declare class RealtimeEngine {
     requestId?: number;
     selectedVehicle: RealtimeTrajectory;
     selectedVehicleId?: RealtimeTrainId;
-    shouldRender: () => boolean;
     sort?: SortFunction;
     styleOptions?: RealtimeStyleOptions;
     tenant: RealtimeTenant;
@@ -95,6 +93,14 @@ declare class RealtimeEngine {
     useDebounce?: boolean;
     useRequestAnimationFrame?: boolean;
     useThrottle?: boolean;
+    get mode(): RealtimeMode;
+    set mode(newMode: RealtimeMode);
+    get speed(): number;
+    set speed(newSpeed: number);
+    get style(): RealtimeStyleFunction;
+    set style(newStyle: RealtimeStyleFunction);
+    get time(): Date;
+    set time(newTime: Date | number);
     constructor(options: RealtimeEngineOptions);
     /**
      * Add a trajectory.
@@ -126,6 +132,7 @@ declare class RealtimeEngine {
      * @return {Promise<FeatureInfo>} Promise with features, layer and coordinate.
      */
     getVehiclesAtCoordinate(coordinate: Coordinate, options?: LayerGetFeatureInfoOptions): FeatureCollection;
+    getViewState: () => ViewState;
     /**
      * Callback on websocket's deleted_vehicles channel events.
      * It removes the trajectory from the list.
@@ -190,6 +197,7 @@ declare class RealtimeEngine {
      */
     renderTrajectoriesInternal(viewState: ViewState, noInterpolate?: boolean): boolean;
     setBbox(): void;
+    shouldRender: () => boolean;
     start(): void;
     /**
      * Start the clock.
@@ -202,13 +210,5 @@ declare class RealtimeEngine {
      * @private
      */
     stopUpdateTime(): void;
-    get mode(): RealtimeMode;
-    set mode(newMode: RealtimeMode);
-    get speed(): number;
-    set speed(newSpeed: number);
-    get style(): RealtimeStyleFunction;
-    set style(newStyle: RealtimeStyleFunction);
-    get time(): Date;
-    set time(newTime: Date | number);
 }
 export default RealtimeEngine;

package/common/utils/RealtimeEngine.js

@@ -14,6 +14,43 @@ import renderTrajectories from './renderTrajectories';
  * This class is totally agnostic from Maplibre or OpenLayers and must stay taht way.
  */
 class RealtimeEngine {
+    get mode() {
+        return this._mode;
+    }
+    set mode(newMode) {
+        var _a, _b;
+        if (newMode === this._mode) {
+            return;
+        }
+        this._mode = newMode;
+        if ((_b = (_a = this.api) === null || _a === void 0 ? void 0 : _a.wsApi) === null || _b === void 0 ? void 0 : _b.open) {
+            this.stop();
+            this.start();
+        }
+    }
+    get speed() {
+        return this._speed;
+    }
+    set speed(newSpeed) {
+        this._speed = newSpeed;
+        this.start();
+    }
+    get style() {
+        return this._style;
+    }
+    set style(newStyle) {
+        this._style = newStyle;
+        this.renderTrajectories();
+    }
+    get time() {
+        return this._time;
+    }
+    set time(newTime) {
+        this._time = (newTime === null || newTime === void 0 ? void 0 : newTime.getTime)
+            ? newTime
+            : new Date(newTime);
+        this.renderTrajectories();
+    }
     constructor(options) {
         this.getViewState = () => ({});
         this.shouldRender = () => true;
@@ -513,42 +550,5 @@ class RealtimeEngine {
             this.updateTimeInterval = undefined;
         }
     }
-    get mode() {
-        return this._mode;
-    }
-    set mode(newMode) {
-        var _a, _b;
-        if (newMode === this._mode) {
-            return;
-        }
-        this._mode = newMode;
-        if ((_b = (_a = this.api) === null || _a === void 0 ? void 0 : _a.wsApi) === null || _b === void 0 ? void 0 : _b.open) {
-            this.stop();
-            this.start();
-        }
-    }
-    get speed() {
-        return this._speed;
-    }
-    set speed(newSpeed) {
-        this._speed = newSpeed;
-        this.start();
-    }
-    get style() {
-        return this._style;
-    }
-    set style(newStyle) {
-        this._style = newStyle;
-        this.renderTrajectories();
-    }
-    get time() {
-        return this._time;
-    }
-    set time(newTime) {
-        this._time = (newTime === null || newTime === void 0 ? void 0 : newTime.getTime)
-            ? newTime
-            : new Date(newTime);
-        this.renderTrajectories();
-    }
 }
 export default RealtimeEngine;

package/maplibre/layers/RealtimeLayer.d.ts

@@ -45,6 +45,9 @@ declare class RealtimeLayer extends Layer {
     layer: LayerSpecification;
     source: CanvasSourceSpecification;
     sourceId: string;
+    get canvas(): AnyCanvas | undefined;
+    get pixelRatio(): number | undefined;
+    set pixelRatio(pixelRatio: number | undefined);
     /**
      * Constructor.
      *
@@ -117,8 +120,5 @@ declare class RealtimeLayer extends Layer {
      * @public
      */
     stop(): void;
-    get canvas(): AnyCanvas | undefined;
-    get pixelRatio(): number | undefined;
-    set pixelRatio(pixelRatio: number | undefined);
 }
 export default RealtimeLayer;

package/maplibre/layers/RealtimeLayer.js

@@ -54,6 +54,15 @@ import Layer from './Layer';
  * @public
  */
 class RealtimeLayer extends Layer {
+    get canvas() {
+        return this.engine.canvas;
+    }
+    get pixelRatio() {
+        return this.engine.pixelRatio || 1;
+    }
+    set pixelRatio(pixelRatio) {
+        this.engine.pixelRatio = pixelRatio || 1;
+    }
     /**
      * Constructor.
      *
@@ -248,15 +257,6 @@ class RealtimeLayer extends Layer {
         (_b = this.map) === null || _b === void 0 ? void 0 : _b.off('moveend', this.onMoveEnd);
         (_c = this.map) === null || _c === void 0 ? void 0 : _c.off('zoomend', this.onZoomEnd);
     }
-    get canvas() {
-        return this.engine.canvas;
-    }
-    get pixelRatio() {
-        return this.engine.pixelRatio || 1;
-    }
-    set pixelRatio(pixelRatio) {
-        this.engine.pixelRatio = pixelRatio || 1;
-    }
 }
 _RealtimeLayer_internalId = new WeakMap();
 export default RealtimeLayer;

package/mbt.js

@@ -46312,21 +46312,10 @@ uniform ${i3} ${a3} u_${s3};
      * @override
      */
     attachToMap(map) {
-      if (this.maplibreLayer && !this.maplibreLayer.getMapInternal()) {
-        map.addLayer(this.maplibreLayer);
-      }
       const mapInternal = this.getMapInternal();
       if (!mapInternal || !this.maplibreLayer) {
         return;
       }
-      if (!mapInternal.getTargetElement()) {
-        this.olEventsKeys.push(
-          mapInternal.on("change:target", () => {
-            this.attachToMap(map);
-          })
-        );
-        return;
-      }
       const { mapLibreMap } = this.maplibreLayer;
       if (mapLibreMap) {
         if (mapLibreMap.loaded()) {
@@ -46679,6 +46668,40 @@ uniform ${i3} ${a3} u_${s3};
       this.onDeleteTrajectoryMessage = this.onDeleteTrajectoryMessage.bind(this);
       this.onDocumentVisibilityChange = this.onDocumentVisibilityChange.bind(this);
     }
+    get mode() {
+      return this._mode;
+    }
+    set mode(newMode) {
+      if (newMode === this._mode) {
+        return;
+      }
+      this._mode = newMode;
+      if (this.api?.wsApi?.open) {
+        this.stop();
+        this.start();
+      }
+    }
+    get speed() {
+      return this._speed;
+    }
+    set speed(newSpeed) {
+      this._speed = newSpeed;
+      this.start();
+    }
+    get style() {
+      return this._style;
+    }
+    set style(newStyle) {
+      this._style = newStyle;
+      this.renderTrajectories();
+    }
+    get time() {
+      return this._time;
+    }
+    set time(newTime) {
+      this._time = newTime?.getTime ? newTime : new Date(newTime);
+      this.renderTrajectories();
+    }
     /**
      * Add a trajectory.
      * @param {RealtimeTrajectory} trajectory The trajectory to add.
@@ -47085,40 +47108,6 @@ uniform ${i3} ${a3} u_${s3};
         this.updateTimeInterval = void 0;
       }
     }
-    get mode() {
-      return this._mode;
-    }
-    set mode(newMode) {
-      if (newMode === this._mode) {
-        return;
-      }
-      this._mode = newMode;
-      if (this.api?.wsApi?.open) {
-        this.stop();
-        this.start();
-      }
-    }
-    get speed() {
-      return this._speed;
-    }
-    set speed(newSpeed) {
-      this._speed = newSpeed;
-      this.start();
-    }
-    get style() {
-      return this._style;
-    }
-    set style(newStyle) {
-      this._style = newStyle;
-      this.renderTrajectories();
-    }
-    get time() {
-      return this._time;
-    }
-    set time(newTime) {
-      this._time = newTime?.getTime ? newTime : new Date(newTime);
-      this.renderTrajectories();
-    }
   };
   var RealtimeEngine_default = RealtimeEngine;
 
@@ -47172,6 +47161,7 @@ uniform ${i3} ${a3} u_${s3};
     }
     renderFrame(frameState) {
       const { canvas: canvas2, renderedViewState } = this.getLayer();
+      this.getLayer().engine.pixelRatio = frameState.pixelRatio;
       if (!this.container) {
         this.container = document.createElement("div");
         this.container.className = this.getLayer().getClassName();
@@ -48474,6 +48464,15 @@ uniform ${i3} ${a3} u_${s3};
 
   // src/maplibre/layers/RealtimeLayer.ts
   var RealtimeLayer2 = class extends Layer_default5 {
+    get canvas() {
+      return this.engine.canvas;
+    }
+    get pixelRatio() {
+      return this.engine.pixelRatio || 1;
+    }
+    set pixelRatio(pixelRatio) {
+      this.engine.pixelRatio = pixelRatio || 1;
+    }
     #internalId;
     /**
      * Constructor.
@@ -48674,15 +48673,6 @@ uniform ${i3} ${a3} u_${s3};
       this.map?.off("moveend", this.onMoveEnd);
       this.map?.off("zoomend", this.onZoomEnd);
     }
-    get canvas() {
-      return this.engine.canvas;
-    }
-    get pixelRatio() {
-      return this.engine.pixelRatio || 1;
-    }
-    set pixelRatio(pixelRatio) {
-      this.engine.pixelRatio = pixelRatio || 1;
-    }
   };
   var RealtimeLayer_default2 = RealtimeLayer2;