mobility-toolbox-js 3.2.0 → 3.2.2

package/api/RoutingAPI.d.ts

@@ -8,7 +8,7 @@ export interface RoutingAPIOptions {
  * This class provides convenience methods to use to the [geOps Routing API](https://developer.geops.io/apis/routing).
  *
  * @example
- * import { RoutingAPI } from 'mobility-toolbox-js';
+ * import { RoutingAPI } from 'mobility-toolbox-js/api';
  *
  * const api = new RoutingAPI({
  *   apiKey: [yourApiKey],

package/api/RoutingAPI.js

@@ -3,7 +3,7 @@ import HttpAPI from './HttpAPI';
  * This class provides convenience methods to use to the [geOps Routing API](https://developer.geops.io/apis/routing).
  *
  * @example
- * import { RoutingAPI } from 'mobility-toolbox-js';
+ * import { RoutingAPI } from 'mobility-toolbox-js/api';
  *
  * const api = new RoutingAPI({
  *   apiKey: [yourApiKey],

package/common/styles/realtimeDefaultStyle.js

@@ -136,7 +136,29 @@ const cache = {};
  * @private
  */
 const realtimeDefaultStyle = (trajectory, viewState, options) => {
-    const { delayDisplay = 300000, delayOutlineColor = '#000', getBgColor = () => '#000', getDelayColor = () => '#000', getDelayFont = (fontSize) => `bold ${fontSize}px arial, sans-serif`, getDelayText = () => null, getMaxRadiusForStrokeAndDelay = () => 7, getMaxRadiusForText = () => 10, getRadius = () => 0, getText = (text) => text, getTextColor = () => '#000', getTextFont = (fontSize) => `bold ${fontSize}px arial, sans-serif`, getTextSize = () => 14, hoverVehicleId, selectedVehicleId, useDelayStyle, } = options;
+    const { delayDisplay = 300000, delayOutlineColor = '#000', getBgColor = () => {
+        return '#000';
+    }, getDelayColor = () => {
+        return '#000';
+    }, getDelayFont = (fontSize) => {
+        return `bold ${fontSize}px arial, sans-serif`;
+    }, getDelayText = () => {
+        return null;
+    }, getMaxRadiusForStrokeAndDelay = () => {
+        return 7;
+    }, getMaxRadiusForText = () => {
+        return 10;
+    }, getRadius = () => {
+        return 0;
+    }, getText = (text) => {
+        return text;
+    }, getTextColor = () => {
+        return '#000';
+    }, getTextFont = (fontSize) => {
+        return `bold ${fontSize}px arial, sans-serif`;
+    }, getTextSize = () => {
+        return 14;
+    }, hoverVehicleId, selectedVehicleId, useDelayStyle, } = options;
     const { pixelRatio = 1, zoom } = viewState;
     let { type } = trajectory.properties;
     const { delay, line, operator_provides_realtime_journey: operatorProvidesRealtime, state, train_id: id, } = trajectory.properties;
@@ -173,10 +195,7 @@ const realtimeDefaultStyle = (trajectory, viewState, options) => {
     // Optimize the cache key, very important in high zoom level
     let key = `${radius}${hover || selected}`;
     if (useDelayStyle) {
-        key += `${operatorProvidesRealtime}${delay}`;
-        if (isDisplayStrokeAndDelay) {
-            key += `${cancelled}`;
-        }
+        key += `${operatorProvidesRealtime}${delay}${cancelled}`;
     }
     else {
         key += `${color || type}`;

package/common/utils/RealtimeEngine.d.ts

@@ -1,10 +1,10 @@
+import type { Coordinate } from 'ol/coordinate';
 import { FeatureCollection } from 'geojson';
 import GeoJSON from 'ol/format/GeoJSON';
 import { RealtimeAPI } from '../../api';
 import { WebSocketAPIMessageEventData } from '../../api/WebSocketAPI';
 import { AnyCanvas, LayerGetFeatureInfoOptions, RealtimeGeneralizationLevel, RealtimeMode, RealtimeMot, RealtimeRenderState, RealtimeStyleFunction, RealtimeStyleOptions, RealtimeTenant, RealtimeTrainId, RealtimeTrajectory, ViewState } from '../../types';
 import { FilterFunction, SortFunction } from '../typedefs';
-import type { Coordinate } from 'ol/coordinate';
 export interface RealtimeEngineOptions {
     api?: RealtimeAPI;
     apiKey?: string;

package/common/utils/RealtimeEngine.js

@@ -53,8 +53,12 @@ class RealtimeEngine {
     }
     constructor(options) {
         this.isIdle = false;
-        this.getViewState = () => ({});
-        this.shouldRender = () => true;
+        this.getViewState = () => {
+            return {};
+        };
+        this.shouldRender = () => {
+            return true;
+        };
         this._mode = options.mode || RealtimeModes.TOPOGRAPHIC;
         this._speed = options.speed || 1; // If live property is true. The speed is ignored.
         this._style = options.style || realtimeDefaultStyle;
@@ -86,8 +90,16 @@ class RealtimeEngine {
         this.useDebounce = options.useDebounce || false;
         this.useRequestAnimationFrame = options.useRequestAnimationFrame || false;
         this.useThrottle = options.useThrottle !== false; // the default behavior
-        this.getViewState = options.getViewState || (() => ({}));
-        this.shouldRender = options.shouldRender || (() => true);
+        this.getViewState =
+            options.getViewState ||
+                (() => {
+                    return {};
+                });
+        this.shouldRender =
+            options.shouldRender ||
+                (() => {
+                    return true;
+                });
         this.onRender = options.onRender;
         this.onIdle = options.onIdle;
         this.onStart = options.onStart;
@@ -481,7 +493,6 @@ class RealtimeEngine {
         /* @private */
         this.mots = this.getMotsByZoom(zoomFloor);
         if (this.mots) {
-            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             bbox.push(`mots=${this.mots}`);
         }
         if (this.tenant) {
@@ -492,7 +503,6 @@ class RealtimeEngine {
         }
         if (this.bboxParameters) {
             Object.entries(this.bboxParameters).forEach(([key, value]) => {
-                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                 bbox.push(`${key}=${value}`);
             });
         }

package/common/utils/realtimeConfig.js

@@ -100,7 +100,9 @@ export const textColors = [
  */
 export const getTypeIndex = (type) => {
     if (typeof type === 'string') {
-        return types.findIndex((t) => t.test(type));
+        return types.findIndex((t) => {
+            return t.test(type);
+        });
     }
     return type;
 };
@@ -152,7 +154,6 @@ export const getTextSize = (ctx, markerSize, text, fontSize, getTextFont) => {
     const maxiter = 25;
     let i = 0;
     while (newText.width > markerSize - 6 && i < maxiter) {
-        // eslint-disable-next-line no-param-reassign
         fontSize -= 0.5;
         ctx.font = getTextFont(fontSize, text);
         newText = ctx.measureText(text);