mobility-toolbox-js 2.0.0-beta.51 → 2.0.0-beta.53

package/ol/layers/RoutingLayer.d.ts

@@ -1,4 +1,13 @@
-export default RoutingLayer;
+import { Vector as VectorSource } from 'ol/source';
+import { Vector } from 'ol/layer';
+import type { StyleLike } from 'ol/style/Style';
+import { Geometry } from 'ol/geom';
+import Layer from './Layer';
+import type { OlLayerOptions } from './Layer';
+export declare type OlRoutingLayerOptions = OlLayerOptions & {
+    olLayer?: Vector<VectorSource<Geometry>>;
+    style?: StyleLike;
+};
 /**
  * A class use to display vector data.
  *
@@ -6,19 +15,20 @@ export default RoutingLayer;
  * @extends {Layer}
  */
 declare class RoutingLayer extends Layer {
+    olLayer?: Vector<VectorSource<Geometry>>;
+    options: OlRoutingLayerOptions;
     /**
      * Constructor.
      * @param {Object} [options]
      * @param {ol/style/Style~StyleLike} [options.style] Style to be used for routes, uses (ol/StyleLike) [https://openlayers.org/en/latest/apidoc/module-ol_style_Style.html#~StyleLike] instances
      */
-    constructor(options?: Object | undefined);
-    olLayer: any;
+    constructor(options: OlRoutingLayerOptions);
     /**
      * Create a copy of the RoutingLayer.
      * @param {Object} newOptions Options to override
      * @return {RoutingLayer} A RoutingLayer
      */
-    clone(newOptions: Object): RoutingLayer;
+    clone(newOptions: OlRoutingLayerOptions): RoutingLayer;
 }
-import Layer from "./Layer";
+export default RoutingLayer;
 //# sourceMappingURL=RoutingLayer.d.ts.map

package/ol/layers/RoutingLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RoutingLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/RoutingLayer.js"],"names":[],"mappings":";AA8DA;;;;;GAKG;AACH;IACE;;;;OAIG;IACH,0CASC;IANC,aAKI;IAGN;;;;OAIG;IACH,kBAHW,MAAM,GACL,YAAY,CAIvB;CACF"}
+{"version":3,"file":"RoutingLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/RoutingLayer.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,KAAK,EAAiB,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACnC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAE9C,oBAAY,qBAAqB,GAAG,cAAc,GAAG;IACnD,OAAO,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzC,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,CAAC;AA8DF;;;;;GAKG;AACH,cAAM,YAAa,SAAQ,KAAK;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEzC,OAAO,EAAE,qBAAqB,CAAM;IAEpC;;;;OAIG;gBACS,OAAO,EAAE,qBAAqB;IAW1C;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,qBAAqB;CAGxC;AAED,eAAe,YAAY,CAAC"}

package/ol/layers/RoutingLayer.js

@@ -43,7 +43,7 @@ const defaultStyleFunction = (feature, resolution) => {
     const maxResolution = feature.get('maxResolution');
     const inRange = resolution <= minResolution && resolution > maxResolution;
     if (minResolution && maxResolution && !inRange) {
-        return null;
+        return [];
     }
     const mot = feature.get('mot');
     if (mot !== 'foot') {
@@ -63,8 +63,9 @@ class RoutingLayer extends Layer {
      * @param {Object} [options]
      * @param {ol/style/Style~StyleLike} [options.style] Style to be used for routes, uses (ol/StyleLike) [https://openlayers.org/en/latest/apidoc/module-ol_style_Style.html#~StyleLike] instances
      */
-    constructor(options = {}) {
+    constructor(options) {
         super(options);
+        this.options = {};
         this.olLayer =
             options.olLayer ||
                 new Vector({

package/ol/styles/fullTrajectoryStyle.d.ts

@@ -1,5 +1,5 @@
-import { Feature } from 'ol';
+import type { FeatureLike } from 'ol/Feature';
 import { Style } from 'ol/style';
-declare const fullTrajectorystyle: (feature: Feature, resolution: number, options: any) => Style[];
+declare const fullTrajectorystyle: (feature: FeatureLike, resolution: number, options: any) => Style[];
 export default fullTrajectorystyle;
 //# sourceMappingURL=fullTrajectoryStyle.d.ts.map

package/ol/styles/fullTrajectoryStyle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fullTrajectoryStyle.d.ts","sourceRoot":"","sources":["../../../src/ol/styles/fullTrajectoryStyle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAwB,MAAM,UAAU,CAAC;AAiBvD,QAAA,MAAM,mBAAmB,YACd,OAAO,cACJ,MAAM,WACT,GAAG,KACX,KAAK,EAgCP,CAAC;AACF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"fullTrajectoryStyle.d.ts","sourceRoot":"","sources":["../../../src/ol/styles/fullTrajectoryStyle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAwB,MAAM,UAAU,CAAC;AAiBvD,QAAA,MAAM,mBAAmB,YACd,WAAW,cACR,MAAM,WACT,GAAG,KACX,KAAK,EAgCP,CAAC;AACF,eAAe,mBAAmB,CAAC"}

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": "2.0.0-beta.51",
+  "version": "2.0.0-beta.53",
   "main": "index.js",
   "exports": {
     ".": "./index.js",

package/types/common.d.ts

@@ -16,6 +16,7 @@ import type {
 } from '../ol';
 import { RealtimeTrajectory } from '../api/typedefs';
 import CommonLayer, { LayerCommonOptions } from '../common/layers/LayerCommon';
+import { RoutingParameters } from '.';
 
 export type StyleCache = { [key: string]: AnyCanvas };
 
@@ -63,7 +64,7 @@ export type RealtimeStyleFunction = (
   trajectory: RealtimeTrajectory,
   viewState: ViewState,
   options: RealtimeStyleOptions,
-) => CanvasImageSource;
+) => AnyCanvas | null;
 
 export type RealtimeRenderState = {
   center?: Coordinate;
@@ -111,3 +112,7 @@ export type UserInteractionCallback = (
   coordinate: Coordinate,
   event: ObjectEvent,
 ) => void;
+
+export type RoutingGraph = [RoutingParameters.graph, number, number];
+export type RoutingMot = RoutingParameters.mot;
+export type RoutingViaPoint = string | Coordinate;

package/types/realtime.d.ts

@@ -69,7 +69,7 @@ export interface RealtimeTrajectoryProperties {
   operator_provides_realtime_journey: 'unknown' | 'yes' | 'no';
   rake?: string;
   raw_time?: string;
-  routeIdentifier: string;
+  route_identifier: string;
   state: RealtimeTrajectoryState;
   tenant: string;
   time_intervals?: Array<Array<number>>;
@@ -79,9 +79,21 @@ export interface RealtimeTrajectoryProperties {
   train_number?: number;
   type: RealtimeMots;
 
-  // TODO: verify why these properties are used in createTrackerFilter
-  operator?: string; // TODO not sure if this property exists, see createTrackerFilter code.
-  name?: string; // TODO not sure if this property exists, see createTrackerFilter code.
+  operator?: string; // deprecated, operator is an old property, use tenant instead.
+  name?: string; // deprecated, name is an old property, use line.name instead.
+
+  // Tralis
+  event?: string;
+  event_delay?: number;
+  event_timestamp?: number;
+  original_line?: RealtimeLine;
+  original_rake?: string;
+  original_train_number?: number;
+  position_correction?: number;
+  raw_coordinates?: [number, number];
+  ride_state?: string;
+  routeIdentifier?: string;
+  transmitting_vehicle?: string;
 }
 
 export interface RealtimeTrajectory extends Feature {

package/common/utils/createTrackerFilters.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"createTrackerFilters.d.ts","sourceRoot":"","sources":["../../../src/common/utils/createTrackerFilters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD;;;;;;;;GAQG;AACH,QAAA,MAAM,aAAa,SACX,MAAM,GAAG,MAAM,EAAE,SAChB,MAAM,GAAG,MAAM,EAAE,YACd,MAAM,GAAG,MAAM,EAAE,aAChB,MAAM,GAAG,MAAM,EAAE,mBACb,kBAAkB,KAAK,OAAO,QA2E9C,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/common/utils/trackerConfig.d.ts

@@ -1,24 +0,0 @@
-/**
- * Trajserv value: 'Tram',  'Subway / Metro / S-Bahn',  'Train', 'Bus', 'Ferry', 'Cable Car', 'Gondola', 'Funicular', 'Long distance bus', 'Rail',
- * New endpoint use Rail instead of Train.
- * New tracker values:  null, "tram", "subway", "rail", "bus", "ferry", "cablecar", "gondola", "funicular", "coach".
- *
- * @ignore
- */
-export const types: RegExp[];
-/**
- * @ignore
- */
-export const bgColors: string[];
-/**
- * @ignore
- */
-export const textColors: string[];
-export function getTypeIndex(type: any): any;
-export function getRadius(type: any, zoom: any): any;
-export function getBgColor(type?: number): string | 1;
-export function getTextColor(type?: number): string | 1;
-export function getTextSize(ctx: any, markerSize: any, text: any, fontSize: any): any;
-export function getDelayColor(delayInMs: number, cancelled: boolean, isDelayText: boolean): "#ff0000" | "#a0a0a0" | "#ed004c" | "#e80000" | "#ff4a00" | "#f7bf00" | "#00a00c";
-export function getDelayText(delayInMs: any, cancelled: any): string;
-//# sourceMappingURL=trackerConfig.d.ts.map

package/common/utils/trackerConfig.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"trackerConfig.d.ts","sourceRoot":"","sources":["../../../src/common/utils/trackerConfig.js"],"names":[],"mappings":"AAaA;;;;;;GAMG;AACH,6BAWE;AAEF;;GAEG;AACH,gCAWE;AAEF;;GAEG;AACH,kCAWE;AAKK,6CAKN;AAKM,qDAON;AAKM,sDAON;AAKM,wDAON;AAKM,sFAkBN;AAQM,yCAJI,MAAM,aACN,OAAO,eACP,OAAO,qFAsBjB;AAKM,qEAmBN"}