mobility-toolbox-js 2.0.0-beta.59 → 2.0.0-beta.60

package/mbt.js

@@ -34164,14 +34164,8 @@ uniform ${i3} ${o3} u_${a3};
   var debounceWebsocketMessages_default = debounceWebsocketMessages;
 
   // src/common/utils/getRealtimeModeSuffix.ts
-  var getRealtimeModeSuffix = (mode, modes, tenant) => {
-    const schematicSuffix = ["", "schematic"];
-    if (tenant) {
-      schematicSuffix.push(tenant);
-    }
-    return mode === modes.SCHEMATIC ? schematicSuffix.join("_") : "";
-  };
-  var getRealtimeModeSuffix_default = getRealtimeModeSuffix;
+  var getModeSuffix = (mode, modes) => mode === modes.SCHEMATIC ? "_schematic" : "";
+  var getRealtimeModeSuffix_default = getModeSuffix;
 
   // src/api/RealtimeAPI.ts
   var RealtimeModes = {
@@ -34182,7 +34176,7 @@ uniform ${i3} ${o3} u_${a3};
   var RealtimeAPI = class {
     constructor(options = {}) {
       this.defineProperties(options);
-      this.tenant = options.tenant;
+      this.prefix = options.prefix || "";
       this.onOpen = this.onOpen.bind(this);
     }
     defineProperties(options) {
@@ -34301,9 +34295,9 @@ uniform ${i3} ${o3} u_${a3};
       this.wsApi.subscribe({ channel }, onSuccess, onError, quiet);
     }
     unsubscribe(channel, suffix = "", onMessage) {
-      const suffixSchematic = getRealtimeModeSuffix_default(RealtimeModes.SCHEMATIC, RealtimeModes, this.tenant);
-      const suffixTopographic = getRealtimeModeSuffix_default(RealtimeModes.TOPOGRAPHIC, RealtimeModes, this.tenant);
-      this.wsApi.unsubscribe(`${channel}${suffixSchematic}${suffix || ""}`, onMessage);
+      const suffixSchenatic = getRealtimeModeSuffix_default(RealtimeModes.SCHEMATIC, RealtimeModes);
+      const suffixTopographic = getRealtimeModeSuffix_default(RealtimeModes.TOPOGRAPHIC, RealtimeModes);
+      this.wsApi.unsubscribe(`${channel}${suffixSchenatic}${suffix || ""}`, onMessage);
       this.wsApi.unsubscribe(`${channel}${suffixTopographic}${suffix || ""}`, onMessage);
     }
     subscribeDepartures(stationId, onMessage, onError = () => {
@@ -34315,16 +34309,14 @@ uniform ${i3} ${o3} u_${a3};
     }
     subscribeDisruptions(onMessage, onError = () => {
     }, quiet = false) {
-      const channel = [this.tenant, "newsticker"];
-      this.subscribe(channel.join("_"), onMessage, onError, quiet);
+      this.subscribe(`${this.prefix}newsticker`, onMessage, onError, quiet);
     }
     unsubscribeDisruptions(onMessage) {
-      const channel = [this.tenant, "newsticker"];
-      this.unsubscribe(channel.join("_"), "", onMessage);
+      this.unsubscribe(`${this.prefix}newsticker`, "", onMessage);
     }
     getStation(uic, mode) {
       const params = {
-        channel: `station${getRealtimeModeSuffix_default(mode, RealtimeModes, this.tenant)}`,
+        channel: `station${getRealtimeModeSuffix_default(mode, RealtimeModes)}`,
         args: uic
       };
       return new Promise((resolve, reject) => {
@@ -34334,13 +34326,13 @@ uniform ${i3} ${o3} u_${a3};
     getStations(mode, timeout = 100) {
       return new Promise((resolve) => {
         this.wsApi.get({
-          channel: `station${getRealtimeModeSuffix_default(mode, RealtimeModes, this.tenant)}`
+          channel: `station${getRealtimeModeSuffix_default(mode, RealtimeModes)}`
         }, debounceWebsocketMessages_default(resolve, void 0, timeout));
       });
     }
     subscribeStations(mode, onMessage, onError = () => {
     }, quiet = false) {
-      this.subscribe(`station${getRealtimeModeSuffix_default(mode, RealtimeModes, this.tenant)}`, onMessage, onError, quiet);
+      this.subscribe(`station${getRealtimeModeSuffix_default(mode, RealtimeModes)}`, onMessage, onError, quiet);
     }
     unsubscribeStations(onMessage) {
       this.unsubscribe("station", "", onMessage);
@@ -34355,7 +34347,7 @@ uniform ${i3} ${o3} u_${a3};
     subscribeTrajectory(mode, onMessage, onError = () => {
     }, quiet = false) {
       this.unsubscribeTrajectory(onMessage);
-      this.subscribe(`trajectory${getRealtimeModeSuffix_default(mode, RealtimeModes, this.tenant)}`, onMessage, onError, quiet);
+      this.subscribe(`trajectory${getRealtimeModeSuffix_default(mode, RealtimeModes)}`, onMessage, onError, quiet);
     }
     unsubscribeTrajectory(onMessage) {
       this.unsubscribe(`trajectory`, "", onMessage);
@@ -34363,15 +34355,13 @@ uniform ${i3} ${o3} u_${a3};
     subscribeDeletedVehicles(mode, onMessage, onError = () => {
     }, quiet = false) {
       this.unsubscribeDeletedVehicles(onMessage);
-      this.subscribe(`deleted_vehicles${getRealtimeModeSuffix_default(mode, RealtimeModes, this.tenant)}`, onMessage, onError, quiet);
+      this.subscribe(`deleted_vehicles${getRealtimeModeSuffix_default(mode, RealtimeModes)}`, onMessage, onError, quiet);
     }
     unsubscribeDeletedVehicles(onMessage) {
       this.unsubscribe("deleted_vehicles", "", onMessage);
     }
     getFullTrajectory(id, mode, generalizationLevel) {
-      const channel = [
-        `full_trajectory${getRealtimeModeSuffix_default(mode, RealtimeModes)}`
-      ];
+      const channel = [`full_trajectory${getRealtimeModeSuffix_default(mode, RealtimeModes)}`];
       if (id) {
         channel.push(id);
       }
@@ -35737,10 +35727,13 @@ uniform ${i3} ${o3} u_${a3};
 
   // src/common/utils/getMaplibreRender.ts
   function getMaplibreRender(maplibreLayer) {
-    const emptyDiv = document.createElement("div");
+    let emptyDiv;
     return (frameState) => {
       const { map, mbMap, olLayer } = maplibreLayer;
       if (!map || !mbMap) {
+        if (!emptyDiv) {
+          emptyDiv = document.createElement("div");
+        }
         return emptyDiv;
       }
       const canvas2 = mbMap.getCanvas();
@@ -35764,10 +35757,13 @@ uniform ${i3} ${o3} u_${a3};
 
   // src/common/utils/getMapboxRender.ts
   function getMapboxRender(mapoxLayer) {
-    const emptyDiv = document.createElement("div");
+    let emptyDiv;
     return (frameState) => {
       const { map, mbMap, renderState, olLayer } = mapoxLayer;
       if (!map || !mbMap) {
+        if (!emptyDiv) {
+          emptyDiv = document.createElement("div");
+        }
         return emptyDiv;
       }
       let changed = false;
@@ -49116,8 +49112,9 @@ uniform ${i3} ${o3} u_${a3};
       }
       if (filterFunc) {
         const visibilityValue = visible ? "visible" : "none";
-        for (let i = 0; i < style.layers.length; i += 1) {
-          const styleLayer = style.layers[i];
+        const layers = style.layers || [];
+        for (let i = 0; i < layers.length; i += 1) {
+          const styleLayer = layers[i];
           if (filterFunc(styleLayer)) {
             if (mbMap.getLayer(styleLayer.id)) {
               mbMap.setLayoutProperty(styleLayer.id, "visibility", visibilityValue);
@@ -49142,14 +49139,11 @@ uniform ${i3} ${o3} u_${a3};
           hitTolerance: 10,
           ...options
         });
-        this.minZoomInterpolation = 8;
         this.debug = options.debug || false;
         this.mode = options.mode || RealtimeModes.TOPOGRAPHIC;
         this.api = options.api || new RealtimeAPI_default(options);
         this.tenant = options.tenant || "";
-        if (!Number.isNaN(options.minZoomInterpolation)) {
-          this.minZoomInterpolation = options.minZoomInterpolation || 0;
-        }
+        this.minZoomInterpolation = options.minZoomInterpolation || 8;
         this.format = new GeoJSON_default();
         const allMots = [
           "tram",
@@ -49235,6 +49229,7 @@ uniform ${i3} ${o3} u_${a3};
           canvas: canvas2,
           styleOptions
         } = options;
+        let currCanvas = canvas2;
         let currSpeed = speed || 1;
         let currTime = time || new Date();
         let currStyle = style || realtimeDefaultStyle_default;
@@ -49242,7 +49237,15 @@ uniform ${i3} ${o3} u_${a3};
         Object.defineProperties(this, {
           isTrackerLayer: { value: true },
           canvas: {
-            value: canvas2 || document.createElement("canvas")
+            get: () => {
+              if (!currCanvas) {
+                currCanvas = document.createElement("canvas");
+              }
+              return currCanvas;
+            },
+            set: (cnvas) => {
+              currCanvas = cnvas;
+            }
           },
           style: {
             get: () => currStyle,
@@ -49336,6 +49339,7 @@ uniform ${i3} ${o3} u_${a3};
       }
       start() {
         this.stop();
+        this.purgeOutOfDateTrajectories();
         this.renderTrajectories();
         this.startUpdateTime();
         this.api.open();
@@ -49501,6 +49505,17 @@ uniform ${i3} ${o3} u_${a3};
           return response;
         });
       }
+      purgeOutOfDateTrajectories() {
+        Object.entries(this.trajectories || {}).forEach(([key, trajectory]) => {
+          const timeIntervals = trajectory?.properties?.time_intervals;
+          if (this.time && timeIntervals.length) {
+            const lastTimeInterval = timeIntervals[timeIntervals.length - 1][0];
+            if (lastTimeInterval < this.time) {
+              this.trackerLayer.removeTrajectory(key);
+            }
+          }
+        });
+      }
       purgeTrajectory(trajectory, extent, zoom) {
         const { type, bounds } = trajectory.properties;
         if (!intersects(extent, bounds) || this.mots && !this.mots.includes(type) || type !== "rail" && zoom < 9) {
@@ -49539,6 +49554,7 @@ uniform ${i3} ${o3} u_${a3};
         }
         if (document.hidden) {
           this.stop();
+          this.trajectories = {};
         } else {
           this.start();
         }