mobility-toolbox-js 3.0.0-beta.9 → 3.0.0

package/types/common.d.ts

@@ -2,55 +2,56 @@ import { Feature } from 'ol';
 import { Coordinate } from 'ol/coordinate';
 import { ObjectEvent } from 'ol/Object';
 import { Pixel } from 'ol/pixel';
-import type { RealtimeMot, RealtimeTrainId } from './realtime';
+
+import { RealtimeTrajectory } from '../api/typedefs';
+
 import type {
   CopyrightControl as MbCopyrightControl,
-  RealtimeLayer as MbRealtimeLayer,
   layer as MbLayer,
+  RealtimeLayer as MbRealtimeLayer,
 } from '../maplibre';
 import type {
-  CopyrightControl as OlCopyrightControl,
   MapboxLayer,
   MaplibreLayer,
-  RealtimeLayer as OlRealtimeLayer,
+  CopyrightControl as OlCopyrightControl,
   layer as OlLayer,
+  RealtimeLayer as OlRealtimeLayer,
 } from '../ol';
-import { RealtimeTrajectory } from '../api/typedefs';
-import CommonLayer, {
-  LayerCommonOptions,
-} from '../ol/mixins/PropertiesLayerMixin';
+
+import type { RealtimeMot, RealtimeTrainId } from './realtime';
+
 import type { RoutingParameters } from '.';
 
-export type StyleCache = { [key: string]: AnyCanvas };
+export type StyleCache = Record<string, AnyCanvas>;
 
-export type ViewState = {
-  time?: number;
+export interface ViewState {
   center?: number[];
   extent?: number[];
-  size?: number[];
-  rotation?: number;
+  pixelRatio?: number;
   resolution?: number;
+  rotation?: number;
+  size?: number[];
+  time?: number;
   zoom?: number;
-  pixelRatio?: number;
-};
+  visible?:boolean;
+}
 
-export type RealtimeStyleOptions = {
-  hoverVehicleId?: RealtimeTrainId;
-  selectedVehicleId?: RealtimeTrainId;
-  useDelayStyle?: boolean;
-  delayOutlineColor?: string;
+export interface RealtimeStyleOptions {
   delayDisplay?: number;
-  noInterpolate?: boolean;
+  delayOutlineColor?: string;
   filter?: FilterFunction;
-  getRadius?: (type: RealtimeMot, z: number) => number;
   getBgColor?: (type: RealtimeMot) => string;
   getDelayColor?: (
-    delay: number | null,
+    delay: null | number,
     cancelled?: boolean,
     isDelayText?: boolean,
   ) => string;
   getDelayFont?: (fontSize: number, text?: string) => string;
-  getDelayText?: (delay: number | null, cancelled?: boolean) => string;
+  getDelayText?: (delay: null | number, cancelled?: boolean) => string;
+  getMaxRadiusForStrokeAndDelay?: () => number;
+  getMaxRadiusForText?: () => number;
+  getRadius?: (type: RealtimeMot, z: number) => number;
+  getScreenPixel?: (pixel: Pixel, viewState: ViewState) => Pixel;
   getText?: (text?: string) => string;
   getTextColor?: (type: RealtimeMot) => string;
   getTextFont?: (fontSize: number, text?: string) => string;
@@ -61,14 +62,13 @@ export type RealtimeStyleOptions = {
     fontSize: number,
     getFont: (fontSize: number, text?: string) => string,
   ) => number;
-  getMaxRadiusForText?: () => number;
-  getMaxRadiusForStrokeAndDelay?: () => number;
-  getScreenPixel?: (pixel: Pixel, viewState: ViewState) => Pixel;
-};
+  hoverVehicleId?: RealtimeTrainId;
+  noInterpolate?: boolean;
+  selectedVehicleId?: RealtimeTrainId;
+  useDelayStyle?: boolean;
+}
 
-export type RealtimeTrajectories = {
-  [key: RealtimeTrainId]: RealtimeTrajectory;
-};
+export type RealtimeTrajectories = Record<RealtimeTrainId, RealtimeTrajectory>;
 
 export type RealtimeStyleFunction = (
   trajectory: RealtimeTrajectory,
@@ -76,54 +76,38 @@ export type RealtimeStyleFunction = (
   options: RealtimeStyleOptions,
 ) => AnyCanvas | null;
 
-export type RealtimeRenderState = {
+export interface RealtimeRenderState {
   center?: Coordinate;
-  zoom?: number;
-  rotation?: number;
   renderedTrajectories?: RealtimeTrajectory[];
-};
+  rotation?: number;
+  zoom?: number;
+}
 
-export type AnyMap = OlMap | MaplibreMap | MapboxMap;
-export type AnyLayer = OlLayer | MbLayer;
-export type AnyOlLayer = OlLayer;
-export type AnyMapboxLayer = MapboxLayer | MaplibreLayer;
-export type AnyRealtimeLayer = MbRealtimeLayer | OlRealtimeLayer;
-export type AnyCopyrightControl = MbCopyrightControl | OlCopyrightControl;
-export type AnyMapGlMap = maplibregl.Map | maplibregl.Map;
-export type AnyMapGlMapOptions = maplibregl.MapOptions | maplibregl.MapOptions;
+export type AnyMapGlMap = maplibregl.Map;
+export type AnyMapGlMapOptions = maplibregl.MapOptions;
 export type AnyCanvas = HTMLCanvasElement | OffscreenCanvas;
 export type AnyCanvasContext =
   | CanvasRenderingContext2D
-  | OffscreenCanvasRenderingContext2D;
-export type GConstructor<T extends CommonLayer> = new (options?: any) => T;
-export type CommonLayerClass = GConstructor<CommonLayer>;
-export type GConstructor2<T extends OlLayer> = new (options?: any) => T;
-export type OlLayerClass = GConstructor<AnyOlLayer>;
-export type AnyLayerClass = GConstructor<AnyLayer>;
-
-export type AnyMapboxLayerClass = GConstructor<AnyMapboxLayer>;
-export type AnyRealtimeLayerClass = GConstructor<AnyRealtimeLayer>;
-export type AnyMapGlMapClass = GConstructor<AnyMapGlMap>;
-export type AnyCopyrightControlClass = GConstructor<AnyCopyrightControl>;
-
-export type LayerGetFeatureInfoResponse = {
-  layer: Layer;
-  features: Feature[];
+  | null
+  | OffscreenCanvasRenderingContext2D
+  | undefined;
+
+export type AnyRealtimeLayer = MbRealtimeLayer | OlRealtimeLayer;
+export type AnyCopyrightControl = MbCopyrightControl | OlCopyrightControl;
+
+
+export interface LayerGetFeatureInfoResponse {
   coordinate: Coordinate;
-};
+  features: Feature[];
+  layer: Layer;
+}
 
-export type LayerGetFeatureInfoOptions = {
-  resolution: number;
+export interface LayerGetFeatureInfoOptions {
   nb?: number;
-};
+  hitTolerance: number = 5;
+}
 
-export type UserInteractionCallback = (
-  features: Feature[],
-  layer: LayerCommonOptions,
-  coordinate: Coordinate,
-  event: ObjectEvent,
-) => void;
 
 export type RoutingGraph = [RoutingParameters.graph, number, number];
 export type RoutingMot = RoutingParameters.mot;
-export type RoutingViaPoint = string | Coordinate;
+export type RoutingViaPoint = Coordinate | string;

package/types/index.d.ts

@@ -1,8 +1,8 @@
 import { Paths as Routing } from './routing';
 import { Paths as Stops } from './stops';
 
-export * from './realtime';
 export * from './common';
+export * from './realtime';
 
 export type RoutingParameters = Routing['/']['get']['parameters']['query'];
 export type RoutingResponse = Routing['/']['get']['responses']['200']['schema'];

package/types/realtime.d.ts

@@ -1,8 +1,8 @@
 import { Feature, FeatureCollection, Point } from 'geojson';
 
-export declare type RealtimeMode = 'topographic' | 'schematic' | 'raw';
+export declare type RealtimeMode = 'raw' | 'schematic' | 'topographic';
 
-export declare type RealtimeChannelModeSuffix = '' | '_schematic';
+export declare type RealtimeChannelModeSuffix = '_schematic' | '';
 
 export type RealtimeTrainId = string;
 
@@ -10,38 +10,38 @@ export type RealtimeStationId = number;
 
 export type RealtimeService =
   | 'redis_websocket_api'
-  | 'tralis_stations'
   | 'tralis_fzo'
-  | 'tralis_worker'
-  | 'tralis_vdv'
-  | 'tralis_newsticker'
   | 'tralis_geofox'
+  | 'tralis_newsticker'
+  | 'tralis_stations'
+  | 'tralis_vdv'
+  | 'tralis_worker'
   | string;
 
-export type RealtimeTenant = 'sbb' | 'sbh' | 'sbm' | '' | string;
+export type RealtimeTenant = '' | 'sbb' | 'sbh' | 'sbm' | string;
 
 export type RealtimeElevatorState = 'ALL_OPERABLE' | string;
 
-export type RealtimeStopState = 'LEAVING' | 'BOARDING' | string;
+export type RealtimeStopState = 'BOARDING' | 'LEAVING' | string;
 
 export type RealtimeTrajectoryState =
-  | 'HIDDEN'
   | 'BOARDING'
-  | 'STOP_CANCELLED'
-  | 'JOURNEY_CANCELLED';
+  | 'HIDDEN'
+  | 'JOURNEY_CANCELLED'
+  | 'STOP_CANCELLED';
 
-export type RealtimeGeneralizationLevel = 5 | 10 | 30 | 100;
+export type RealtimeGeneralizationLevel = 10 | 100 | 30 | 5;
 
 export type RealtimeMot =
-  | 'tram'
-  | 'subway'
-  | 'rail'
   | 'bus'
-  | 'ferry'
   | 'cablecar'
-  | 'gondola'
+  | 'coach'
+  | 'ferry'
   | 'funicular'
-  | 'coach';
+  | 'gondola'
+  | 'rail'
+  | 'subway'
+  | 'tram';
 
 /**
  * @type RealtimeBbox
@@ -60,56 +60,61 @@ export type RealtimeBbox = (number | string)[];
 export type RealtimeBuffer = [number, number];
 
 export type RealtimeChannelName =
-  | 'websocket'
   | 'buffer'
-  | 'line'
   | 'extra_geoms'
   | 'healthcheck'
-  | `timetable_${RealtimeStationId}`
-  | `trajectory${RealtimeChannelModeSuffix}`
+  | 'line'
+  | 'websocket'
   | `deleted_vehicles${RealtimeChannelModeSuffix}`
+  | `full_trajectory${RealtimeChannelModeSuffix}_${RealtimeTenant}_${RealtimeTrainId}`
   | `stopsequence_${RealtimeTenant}_${RealtimeTrainId}`
-  | `full_trajectory${RealtimeChannelModeSuffix}_${RealtimeTenant}_${RealtimeTrainId}`;
+  | `timetable_${RealtimeStationId}`
+  | `trajectory${RealtimeChannelModeSuffix}`;
 
 export interface RealtimeTrajectoryProperties {
   // Tralis and trafimage
   bounds: [number, number, number, number];
-  delay: number | null;
+
+  // Only after first rendering on a map
+  coordinate?: [number, number];
+
+  delay: null | number;
+
+  // Tralis
+  event?: string;
+  event_delay?: number;
   event_timestamp: number;
+  event_timestamp?: number;
   gen_level?: RealtimeGeneralizationLevel;
   gen_range: [number, number];
   has_journey: boolean;
   has_realtime: boolean;
   has_realtime_journey: boolean;
   line?: RealtimeLine;
-  operator_provides_realtime_journey: 'unknown' | 'yes' | 'no';
+  name?: string; // deprecated, name is an old property, use line.name instead.
+  operator?: string; // deprecated, operator is an old property, use tenant instead.
+  operator_provides_realtime_journey: 'no' | 'unknown' | 'yes';
+  original_line?: RealtimeLine;
+  original_rake?: string;
+  original_train_number?: number;
+  position_correction?: number;
   rake?: string;
+  raw_coordinates?: [number, number];
+
   raw_time?: string;
+  ride_state?: string;
+
   route_identifier: string;
+  routeIdentifier?: string;
   state: RealtimeTrajectoryState;
   tenant: string;
-  time_intervals?: Array<Array<number>>;
+  time_intervals?: number[][];
   time_since_update?: string;
   timestamp: number;
   train_id?: RealtimeTrainId;
   train_number?: number;
-  type: RealtimeMots;
-
-  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;
+  type: RealtimeMots;
 }
 
 export interface RealtimeTrajectory extends Feature {
@@ -139,7 +144,7 @@ export interface RealtimeStop {
   aimedDepartureTime: number;
   arrivalDelay?: number;
   arrivalTime: number;
-  cancelled: booblean;
+  cancelled: boolean;
   coordinate: number[];
   departureDelay: number;
   departureTime: number;
@@ -167,14 +172,14 @@ export interface RealtimeStopSequence {
   routeIdentifier: string;
   shortName: string;
   stations: RealtimeStop[];
-  stroke?: strinealtimeTenant;
+  stroke?: RealtimeTenant;
   text_color: string;
   type: RealtimeMot;
   vehicleType: number;
 }
 
 export interface RealtimeExtraGeomProperties {
-  ref: string | number;
+  ref: number | string;
 }
 
 export interface RealtimeExtraGeom extends Feature {
@@ -182,40 +187,38 @@ export interface RealtimeExtraGeom extends Feature {
 }
 
 export interface RealtimeExtraGeomDeleted {
-  type: 'Deleted';
   properties: RealtimeExtraGeomProperties;
+  type: 'Deleted';
 }
 
-export type RealtimeExtraGeoms = {
-  [index: string]: Feature[];
-};
+export type RealtimeExtraGeoms = Record<string, Feature[]>;
 
 export interface RealtimeLine {
-  id: number;
   color: string;
-  stroke: string;
+  id: number;
   name: string;
+  stroke: string;
   text_color: string;
 }
 
 export interface RealtimeTransfer {
-  mot: RealtimeMot;
   lines: string[];
+  mot: RealtimeMot;
 }
 
 export interface RealtimeStationproperties extends Feature {
-  transfers: RealtimeTransfer[];
   elevatorOutOfOrder: boolean;
-  elevatorState: RealtimeElevatorState;
   elevators: object;
-  uic: RealtimeStationId;
-  name: string;
-  networkLines: RealtimeLine[];
-  hasElevator: boolean;
-  hasZOB: boolean;
+  elevatorState: RealtimeElevatorState;
   hasAccessibility: boolean;
   hasAirport: boolean;
+  hasElevator: boolean;
+  hasZOB: boolean;
+  name: string;
+  networkLines: RealtimeLine[];
   tenant: RealtimeTenant;
+  transfers: RealtimeTransfer[];
+  uic: RealtimeStationId;
 }
 
 export interface RealtimeStation extends Feature {
@@ -224,30 +227,30 @@ export interface RealtimeStation extends Feature {
 }
 
 export interface RealtimeDeparture {
-  to: string[];
-  time: number;
-  no_stop_between: boolean;
-  new_to: boolean;
+  at_station_ds100: string;
+  call_id: number;
+  created_at: string;
+  formation: any;
+  fzo_estimated_time: number;
   has_fzo: boolean;
+  line: RealtimeLine;
+  min_arrival_time: number;
+  new_to: boolean;
   next_stoppoints: string[];
+  no_stop_between: boolean;
+  no_stop_till: any;
   platform: string;
-  created_at: string;
-  at_station_ds100: string;
-  train_number: number;
   ris_aimed_time: number;
-  updated_at: number;
-  min_arrival_time: number;
   ris_estimated_time: number;
-  train_id: RealtimeTrainId;
-  fzo_estimated_time: number;
-  train_type: number;
-  call_id: number;
-  line: RealtimeLine;
   state: string; /// (BOARDING|STOP_CANCELLED|JOURNEY_CANCELLED|HIDDEN)/
-  formation: any;
-  no_stop_till: any;
-  timestamp: number; // This property seems to never exists
+  time: number;
   timediff: number; // This property seems to alawy been 0
+  timestamp: number; // This property seems to never exists
+  to: string[];
+  train_id: RealtimeTrainId;
+  train_number: number;
+  train_type: number;
+  updated_at: number;
 }
 
 export interface RealtimeDepartureExtended extends RealtimeDeparture {
@@ -269,68 +272,68 @@ export interface RealtimeNews {
 export interface RealtimeHealth {
   heathly: boolean;
   service: RealtimeService;
-  tenant: string | null;
+  tenant: null | string;
 }
 
 export interface RealtimeExtraGeomsResponse {
-  source: `extra_geoms`;
-  timestamp: number;
   client_reference: null;
   content: RealtimeExtraGeom | RealtimeExtraGeomDeleted;
+  source: `extra_geoms`;
+  timestamp: number;
 }
 
 export interface RealtimeStationResponse {
-  source: `station_${RealtimeStationId}`;
-  timestamp: number;
   client_reference: null;
   content: RealtimeNews;
+  source: `station_${RealtimeStationId}`;
+  timestamp: number;
 }
 
 export interface RealtimeNewsTickerResponse {
-  source: `${RealtimeTenant}_newsticker`;
-  timestamp: number;
   client_reference: null;
   content: RealtimeNews;
+  source: `${RealtimeTenant}_newsticker`;
+  timestamp: number;
 }
 
 export interface RealtimeTimetableResponse {
-  source: `timetable_${RealtimeStationId}`;
-  timestamp: number;
   client_reference: null;
   content: RealtimeDeparture;
+  source: `timetable_${RealtimeStationId}`;
+  timestamp: number;
 }
 
 export interface RealtimeTrajectoryResponse {
-  source: `trajectory${RealtimeChannelModeSuffix}`;
-  timestamp: number;
   client_reference: '';
   content: RealtimeTrajectory;
+  source: `trajectory${RealtimeChannelModeSuffix}`;
+  timestamp: number;
 }
 
 export interface RealtimeStopSequenceResponse {
+  client_reference: '';
+  content: RealtimeStopSequence[];
   source: `stopsequence_${RealtimeTenant}_${RealtimeTrainId}`;
   timestamp: number;
-  client_reference: '';
-  content: Array<RealtimeStopSequence>;
 }
 
 export interface RealtimeBufferResponse {
-  source: 'buffer';
-  timestamp: number;
   client_reference: '';
   content: RealtimeTrajectoryResponse[];
+  source: 'buffer';
+  timestamp: number;
 }
 
 export interface RealtimeDeletedVehiclesResponse {
-  source: `deleted_vehicles${RealtimeChannelModeSuffix}`;
-  timestamp: number;
   client_reference: null;
   content: string;
+  source: `deleted_vehicles${RealtimeChannelModeSuffix}`;
+  timestamp: number;
 }
 
 export interface RealtimeHealthCheckResponse {
-  source: 'healthcheck';
-  timestamp: number;
   client_reference: null;
   content: RealtimeHealth;
+  source: 'healthcheck';
+  timestamp: number;
 }