mobility-toolbox-js 2.0.0-beta.54 → 2.0.0-beta.56

package/common/mixins/RealtimeLayerMixin.d.ts

@@ -3,7 +3,7 @@ import { EventsKey } from 'ol/events';
 import { Coordinate } from 'ol/coordinate';
 import { Feature } from 'ol';
 import { RealtimeAPI } from '../../api';
-import { AnyCanvas, AnyLayerClass, AnyMap, AnyRealtimeLayer, LayerGetFeatureInfoOptions, RealtimeGeneralizationLevel, RealtimeMode, RealtimeRenderState, RealtimeStyleFunction, RealtimeStyleOptions, RealtimeTenant, RealtimeTrainId, ViewState } from '../../types';
+import { AnyCanvas, AnyLayerClass, AnyMap, AnyRealtimeLayer, LayerGetFeatureInfoOptions, RealtimeGeneralizationLevel, RealtimeMode, RealtimeMot, RealtimeRenderState, RealtimeStyleFunction, RealtimeStyleOptions, RealtimeTenant, RealtimeTrainId, ViewState } from '../../types';
 import { RealtimeTrajectory } from '../../api/typedefs';
 import { WebSocketAPIMessageEventData } from '../api/WebSocketAPI';
 import type { OlLayerOptions } from '../../ol/layers/Layer';
@@ -12,9 +12,9 @@ export declare type RealtimeLayerMixinOptions = OlLayerOptions & {
     mode?: RealtimeMode;
     api?: RealtimeAPI;
     tenant?: RealtimeTenant;
-    minZoomNonTrain?: number;
     minZoomInterpolation?: number;
     isUpdateBboxOnMoveEnd?: boolean;
+    motsByZoom?: RealtimeMot[][];
     generalizationLevelByZoom?: RealtimeGeneralizationLevel[];
     renderTimeIntervalByZoom?: number[];
     style?: RealtimeStyleFunction;
@@ -31,6 +31,7 @@ export declare type RealtimeLayerMixinOptions = OlLayerOptions & {
     useRequestAnimationFrame?: boolean;
     useDebounce?: boolean;
     useThrottle?: boolean;
+    getMotsByZoom: (zoom: number, motsByZoom: RealtimeMot[][]) => RealtimeMot[];
     getGeneralizationLevelByZoom?: (zoom: number, generalizationLevelByZoom: RealtimeGeneralizationLevel[]) => RealtimeGeneralizationLevel;
     getRenderTimeIntervalByZoom?: (zoom: number, renderTimeIntervalByZoom: number[]) => number;
     url?: string;
@@ -105,7 +106,6 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
         style?: RealtimeStyleFunction | undefined;
         styleOptions?: RealtimeStyleOptions | undefined;
         pixelRatio?: number | undefined;
-        minZoomNonTrain: number;
         minZoomInterpolation: number;
         isUpdateBboxOnMoveEnd: boolean;
         hoverVehicleId?: string | undefined;
@@ -114,6 +114,8 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
         useRequestAnimationFrame?: boolean | undefined;
         useDebounce?: boolean | undefined;
         useThrottle?: boolean | undefined;
+        mots?: RealtimeMot[] | undefined;
+        motsByZoom: RealtimeMot[][];
         generalizationLevel?: RealtimeGeneralizationLevel | undefined;
         generalizationLevelByZoom: RealtimeGeneralizationLevel[];
         renderTimeIntervalByZoom: number[];
@@ -123,6 +125,7 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
         updateTimeDelay?: number | undefined;
         visibilityRef: EventsKey;
         selectedVehicle: GeoJSONFeature;
+        getMotsByZoom: (zoom: number) => RealtimeMot[];
         getGeneralizationLevelByZoom: (zoom: number) => RealtimeGeneralizationLevel;
         getRenderTimeIntervalByZoom: (zoom: number) => number;
         throttleRenderTrajectories: (viewState: ViewState, noInterpolate?: boolean) => void;
@@ -221,7 +224,7 @@ declare function RealtimeLayerMixin<T extends AnyLayerClass>(Base: T): {
          * Determine if the trajectory is useless and should be removed from the list or not.
          * By default, this function exclude vehicles:
          *  - that have their trajectory outside the current extent and
-         *  - that are not a train and zoom level is lower than layer's minZoomNonTrain property.
+         *  - that aren't in the MOT list.
          *
          * @param {RealtimeTrajectory} trajectory
          * @param {Array<number>} extent

package/common/mixins/RealtimeLayerMixin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RealtimeLayerMixin.d.ts","sourceRoot":"","sources":["../../../src/common/mixins/RealtimeLayerMixin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RealtimeLayerMixin.d.ts","sourceRoot":"","sources":["../../../src/common/mixins/RealtimeLayerMixin.ts"],"names":[],"mappings":"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"}

package/common/mixins/RealtimeLayerMixin.js

@@ -67,9 +67,29 @@ function RealtimeLayerMixin(Base) {
             this.mode = options.mode || RealtimeModes.TOPOGRAPHIC;
             this.api = options.api || new RealtimeAPI(options);
             this.tenant = options.tenant || ''; // sbb,sbh or sbm
-            this.minZoomNonTrain = options.minZoomNonTrain || 9; // Min zoom level from which non trains are allowed to be displayed. Min value is 9 (as configured by the server
             this.minZoomInterpolation = options.minZoomInterpolation || 8; // Min zoom level from which trains positions are not interpolated.
             this.format = new GeoJSON();
+            // MOTs by zoom
+            const allMots = [
+                'tram',
+                'subway',
+                'rail',
+                'bus',
+                'ferry',
+                'cablecar',
+                'gondola',
+                'funicular',
+                'coach',
+            ];
+            // Server will block non train before zoom 9
+            this.motsByZoom = options.motsByZoom || [allMots];
+            this.getMotsByZoom = (zoom) => {
+                return ((options.getMotsByZoom &&
+                    options.getMotsByZoom(zoom, this.motsByZoom)) ||
+                    this.motsByZoom[zoom] ||
+                    this.motsByZoom[this.motsByZoom.length - 1]);
+            };
+            // Generalization levels by zoom
             this.generalizationLevelByZoom = options.generalizationLevelByZoom || [
                 5, 5, 5, 5, 5, 5, 5, 5, 10, 30, 30, 100, 100, 100,
             ];
@@ -78,6 +98,7 @@ function RealtimeLayerMixin(Base) {
                     options.getGeneralizationLevelByZoom(zoom, this.generalizationLevelByZoom)) ||
                     this.generalizationLevelByZoom[zoom]);
             };
+            // Render time interval by zoom
             this.renderTimeIntervalByZoom = options.renderTimeIntervalByZoom || [
                 100000, 50000, 40000, 30000, 20000, 15000, 10000, 5000, 2000, 1000, 400,
                 300, 250, 180, 90, 60, 50, 50, 50, 50, 50,
@@ -112,6 +133,7 @@ function RealtimeLayerMixin(Base) {
             const { style, speed, pixelRatio, hoverVehicleId, selectedVehicleId, filter, sort, time, live, canvas, styleOptions, } = options;
             let currSpeed = speed || 1;
             let currTime = time || new Date();
+            let currStyle = style || realtimeDefaultStyle;
             super.defineProperties(options);
             Object.defineProperties(this, {
                 isTrackerLayer: { value: true },
@@ -122,7 +144,12 @@ function RealtimeLayerMixin(Base) {
                  * Style function used to render a vehicle.
                  */
                 style: {
-                    value: style || realtimeDefaultStyle,
+                    get: () => currStyle,
+                    set: (newStyle) => {
+                        currStyle = newStyle;
+                        // @ts-ignore  function without parameters is defined in subclasses
+                        this.renderTrajectories();
+                    },
                 },
                 /**
                  * Custom options to pass as last parameter of the style function.
@@ -413,6 +440,11 @@ function RealtimeLayerMixin(Base) {
                 if (this.generalizationLevel) {
                     bbox.push(`gen=${this.generalizationLevel}`);
                 }
+                /* @ignore */
+                this.mots = this.getMotsByZoom(zoom);
+                if (this.mots) {
+                    bbox.push(`mots=${this.mots}`);
+                }
             }
             this.api.bbox = bbox;
         }
@@ -518,7 +550,7 @@ function RealtimeLayerMixin(Base) {
          * Determine if the trajectory is useless and should be removed from the list or not.
          * By default, this function exclude vehicles:
          *  - that have their trajectory outside the current extent and
-         *  - that are not a train and zoom level is lower than layer's minZoomNonTrain property.
+         *  - that aren't in the MOT list.
          *
          * @param {RealtimeTrajectory} trajectory
          * @param {Array<number>} extent
@@ -529,7 +561,9 @@ function RealtimeLayerMixin(Base) {
         purgeTrajectory(trajectory, extent, zoom) {
             const { type, bounds } = trajectory.properties;
             if (!intersects(extent, bounds) ||
-                (type !== 'rail' && zoom < (this.minZoomNonTrain || 9))) {
+                (this.mots && !this.mots.includes(type)) ||
+                (type !== 'rail' && zoom < 9) // zoom 9 is defined by the backend
+            ) {
                 this.removeTrajectory(trajectory);
                 return true;
             }

package/common/utils/debounceDeparturesMessages.js

@@ -1,4 +1,4 @@
-import sortAndfilterDepartures from './sortAndFilterDepartures';
+import sortAndFilterDepartures from './sortAndFilterDepartures';
 /**
  * This function returns a WebSocket api callback, and call the onDeparturesUpdate function with the list of current departures to display.
  * @param {function(departures: RealtimeDeparture[])} onDeparturesUpdate callback when list of departures changes, called after 100 ms
@@ -6,7 +6,7 @@ import sortAndfilterDepartures from './sortAndFilterDepartures';
  * @param {number} [maxDepartureAge = 30] max departure age of departures in minutes
  * @param {number} [timeout = 100] debounce timeout in ms
  */
-const debounceDeparturesMessages = (onDeparturesUpdate, sortByMinArrivalTime = true, maxDepartureAge = 30, timeout = 100) => {
+const debounceDeparturesMessages = (onDeparturesUpdate, sortByMinArrivalTime = false, maxDepartureAge = 30, timeout = 100) => {
     const departureUpdateTimeout = {};
     const departureObject = {};
     return (data) => {
@@ -16,7 +16,7 @@ const debounceDeparturesMessages = (onDeparturesUpdate, sortByMinArrivalTime = t
         }
         departureObject[departure.call_id] = departure;
         departureUpdateTimeout[source] = window.setTimeout(() => {
-            const departures = sortAndfilterDepartures(departureObject, sortByMinArrivalTime || false, maxDepartureAge);
+            const departures = sortAndFilterDepartures(departureObject, sortByMinArrivalTime || false, maxDepartureAge);
             onDeparturesUpdate(departures);
         }, timeout);
     };

package/common/utils/index.d.ts

@@ -11,5 +11,6 @@ export { default as getMapboxRender } from "./getMapboxRender";
 export { default as debounceDeparturesMessages } from "./debounceDeparturesMessages";
 export { default as debounceWebsocketMessages } from "./debounceWebsocketMessages";
 export { default as sortAndFilterDepartures } from "./sortAndFilterDepartures";
+export { default as compareDepartures } from "./compareDepartures";
 export * as realtimeConfig from "./realtimeConfig";
 //# sourceMappingURL=index.d.ts.map

package/common/utils/index.js

@@ -11,5 +11,6 @@ export { default as getMapboxRender } from './getMapboxRender';
 export { default as debounceDeparturesMessages } from './debounceDeparturesMessages';
 export { default as debounceWebsocketMessages } from './debounceWebsocketMessages';
 export { default as sortAndFilterDepartures } from './sortAndFilterDepartures';
+export { default as compareDepartures } from './compareDepartures';
 import * as realtimeConfig_1 from './realtimeConfig';
 export { realtimeConfig_1 as realtimeConfig };

package/mapbox/layers/RealtimeLayer.d.ts

@@ -23,7 +23,6 @@ declare const RealtimeLayer_base: {
         style?: import("../../types").RealtimeStyleFunction | undefined;
         styleOptions?: import("../../types").RealtimeStyleOptions | undefined;
         pixelRatio?: number | undefined;
-        minZoomNonTrain: number;
         minZoomInterpolation: number;
         isUpdateBboxOnMoveEnd: boolean;
         hoverVehicleId?: string | undefined;
@@ -32,6 +31,8 @@ declare const RealtimeLayer_base: {
         useRequestAnimationFrame?: boolean | undefined;
         useDebounce?: boolean | undefined;
         useThrottle?: boolean | undefined;
+        mots?: import("../../types").RealtimeMot[] | undefined;
+        motsByZoom: import("../../types").RealtimeMot[][];
         generalizationLevel?: import("../../types").RealtimeGeneralizationLevel | undefined;
         generalizationLevelByZoom: import("../../types").RealtimeGeneralizationLevel[];
         renderTimeIntervalByZoom: number[];
@@ -41,6 +42,7 @@ declare const RealtimeLayer_base: {
         updateTimeDelay?: number | undefined;
         visibilityRef: import("ol/events").EventsKey;
         selectedVehicle: GeoJSONFeature;
+        getMotsByZoom: (zoom: number) => import("../../types").RealtimeMot[];
         getGeneralizationLevelByZoom: (zoom: number) => import("../../types").RealtimeGeneralizationLevel;
         getRenderTimeIntervalByZoom: (zoom: number) => number;
         throttleRenderTrajectories: (viewState: import("../../types").ViewState, noInterpolate?: boolean | undefined) => void;

package/mapbox/layers/RealtimeLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RealtimeLayer.d.ts","sourceRoot":"","sources":["../../../src/mapbox/layers/RealtimeLayer.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExD;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAM,aAAc,SAAQ,kBAAY;gBAC1B,OAAO,KAAK;IAqBxB;;;;;;OAMG;IAEH,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM;IAuC/C;;OAEG;IACH,aAAa;IAkBb;;;;;;OAMG;IACH,KAAK;IAQL;;;;OAIG;IACH,IAAI;IASJ,MAAM;IASN;;;OAGG;IACH,kBAAkB,CAChB,GAAG,EAAE,QAAQ,CAAC,kBAAkB,GAAG,UAAU,CAAC,aAAa;IAQ7D;;;;OAIG;IAEH,kBAAkB,CAAC,aAAa,CAAC,EAAE,OAAe;IAuDlD;;OAEG;IACH,kBAAkB;IAIlB,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,KAAK,GACX,OAAO,CAAC,2BAA2B,CAAC;IAQvC,kBAAkB;IAclB;;;;OAIG;IACH,eAAe,CACb,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,EAAE,MAAM;IASd;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM;IAUhE;;;;OAIG;IACH,MAAM;IAIN,0BAA0B,CACxB,SAAS,EAAE,SAAS,EACpB,aAAa,GAAE,OAAe;IAahC;;;;;OAKG;IACH,SAAS;IAQT;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;CAOzB;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"RealtimeLayer.d.ts","sourceRoot":"","sources":["../../../src/mapbox/layers/RealtimeLayer.ts"],"names":[],"mappings":";AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,OAAO,KAAK,MAAM,SAAS,CAAC;AAE5B,OAAO,EACL,YAAY,EACZ,0BAA0B,EAC1B,2BAA2B,EAC5B,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAExD;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAM,aAAc,SAAQ,kBAAY;gBAC1B,OAAO,KAAK;IAqBxB;;;;;;OAMG;IAEH,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM;IAuC/C;;OAEG;IACH,aAAa;IAkBb;;;;;;OAMG;IACH,KAAK;IAQL;;;;OAIG;IACH,IAAI;IASJ,MAAM;IASN;;;OAGG;IACH,kBAAkB,CAChB,GAAG,EAAE,QAAQ,CAAC,kBAAkB,GAAG,UAAU,CAAC,aAAa;IAQ7D;;;;OAIG;IAEH,kBAAkB,CAAC,aAAa,CAAC,EAAE,OAAe;IAuDlD;;OAEG;IACH,kBAAkB;IAIlB,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,KAAK,GACX,OAAO,CAAC,2BAA2B,CAAC;IAQvC,kBAAkB;IAclB;;;;OAIG;IACH,eAAe,CACb,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,EAAE,MAAM;IASd;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM;IAUhE;;;;OAIG;IACH,MAAM;IAIN,0BAA0B,CACxB,SAAS,EAAE,SAAS,EACpB,aAAa,GAAE,OAAe;IAahC;;;;;OAKG;IACH,SAAS;IAQT;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;CAOzB;AAED,eAAe,aAAa,CAAC"}

package/mbt.js

@@ -33293,6 +33293,7 @@ uniform ${i3} ${o3} u_${a3};
     StopsAPI: () => StopsAPI_default,
     VectorLayer: () => VectorLayer_default2,
     WMSLayer: () => WMSLayer_default,
+    compareDepartures: () => compareDepartures_default,
     createRealtimeFilters: () => createRealtimeFilters_default,
     debounceDeparturesMessages: () => debounceDeparturesMessages_default,
     debounceWebsocketMessages: () => debounceWebsocketMessages_default,
@@ -35879,7 +35880,7 @@ uniform ${i3} ${o3} u_${a3};
   var sortAndFilterDepartures_default = sortAndfilterDepartures;
 
   // src/common/utils/debounceDeparturesMessages.ts
-  var debounceDeparturesMessages = (onDeparturesUpdate, sortByMinArrivalTime = true, maxDepartureAge = 30, timeout = 100) => {
+  var debounceDeparturesMessages = (onDeparturesUpdate, sortByMinArrivalTime = false, maxDepartureAge = 30, timeout = 100) => {
     const departureUpdateTimeout = {};
     const departureObject = {};
     return (data) => {
@@ -49135,9 +49136,23 @@ uniform ${i3} ${o3} u_${a3};
         this.mode = options.mode || RealtimeModes.TOPOGRAPHIC;
         this.api = options.api || new RealtimeAPI_default(options);
         this.tenant = options.tenant || "";
-        this.minZoomNonTrain = options.minZoomNonTrain || 9;
         this.minZoomInterpolation = options.minZoomInterpolation || 8;
         this.format = new GeoJSON_default();
+        const allMots = [
+          "tram",
+          "subway",
+          "rail",
+          "bus",
+          "ferry",
+          "cablecar",
+          "gondola",
+          "funicular",
+          "coach"
+        ];
+        this.motsByZoom = options.motsByZoom || [allMots];
+        this.getMotsByZoom = (zoom) => {
+          return options.getMotsByZoom && options.getMotsByZoom(zoom, this.motsByZoom) || this.motsByZoom[zoom] || this.motsByZoom[this.motsByZoom.length - 1];
+        };
         this.generalizationLevelByZoom = options.generalizationLevelByZoom || [
           5,
           5,
@@ -49209,6 +49224,7 @@ uniform ${i3} ${o3} u_${a3};
         } = options;
         let currSpeed = speed || 1;
         let currTime = time || new Date();
+        let currStyle = style || realtimeDefaultStyle_default;
         super.defineProperties(options);
         Object.defineProperties(this, {
           isTrackerLayer: { value: true },
@@ -49216,7 +49232,11 @@ uniform ${i3} ${o3} u_${a3};
             value: canvas2 || document.createElement("canvas")
           },
           style: {
-            value: style || realtimeDefaultStyle_default
+            get: () => currStyle,
+            set: (newStyle) => {
+              currStyle = newStyle;
+              this.renderTrajectories();
+            }
           },
           styleOptions: {
             value: { ...realtimeConfig_exports, ...styleOptions || {} }
@@ -49399,6 +49419,10 @@ uniform ${i3} ${o3} u_${a3};
           if (this.generalizationLevel) {
             bbox.push(`gen=${this.generalizationLevel}`);
           }
+          this.mots = this.getMotsByZoom(zoom);
+          if (this.mots) {
+            bbox.push(`mots=${this.mots}`);
+          }
         }
         this.api.bbox = bbox;
       }
@@ -49466,7 +49490,7 @@ uniform ${i3} ${o3} u_${a3};
       }
       purgeTrajectory(trajectory, extent, zoom) {
         const { type, bounds } = trajectory.properties;
-        if (!intersects(extent, bounds) || type !== "rail" && zoom < (this.minZoomNonTrain || 9)) {
+        if (!intersects(extent, bounds) || this.mots && !this.mots.includes(type) || type !== "rail" && zoom < 9) {
           this.removeTrajectory(trajectory);
           return true;
         }
@@ -49651,6 +49675,8 @@ uniform ${i3} ${o3} u_${a3};
       super({
         ...options
       });
+      this.allowRenderWhenAnimating = false;
+      this.allowRenderWhenAnimating = !!options.allowRenderWhenAnimating;
       this.olLayer = options.olLayer || new Group_default({
         layers: [
           new Vector_default({
@@ -49757,7 +49783,7 @@ uniform ${i3} ${o3} u_${a3};
         return false;
       }
       let isRendered = false;
-      const blockRendering = this.map.getView().getAnimating() || this.map.getView().getInteracting();
+      const blockRendering = this.allowRenderWhenAnimating ? false : this.map.getView().getAnimating() || this.map.getView().getInteracting();
       isRendered = blockRendering ? false : super.renderTrajectoriesInternal(viewState, noInterpolate);
       if (isRendered) {
         this.renderedViewState = { ...viewState };
@@ -49912,6 +49938,7 @@ uniform ${i3} ${o3} u_${a3};
     RealtimeModes: () => RealtimeModes,
     RoutingAPI: () => RoutingAPI_default,
     StopsAPI: () => StopsAPI_default,
+    compareDepartures: () => compareDepartures_default,
     createRealtimeFilters: () => createRealtimeFilters_default,
     debounceDeparturesMessages: () => debounceDeparturesMessages_default,
     debounceWebsocketMessages: () => debounceWebsocketMessages_default,