mobility-toolbox-js 3.1.2 → 3.2.0-beta.0

package/ol/layers/MaplibreLayer.d.ts

@@ -87,7 +87,7 @@ declare class MaplibreLayer extends MapLibreLayer {
     createRenderer(): MaplibreLayerRenderer;
     detachFromMap(): void;
     disposeInternal(): void;
-    getStyle(): any;
+    getStyle(): string | import("maplibre-gl").StyleSpecification;
     setMapInternal(map: Map): void;
     updateMaplibreMap(): void;
 }

package/ol/layers/MaplibreLayer.js

@@ -160,7 +160,7 @@ class MaplibreLayer extends MapLibreLayer {
         this.setSource(source);
     }
     getStyle() {
-        var _a, _b;
+        var _a;
         // If the style is a complete style object, use it directly.
         if (this.style &&
             typeof this.style === 'object' &&
@@ -173,8 +173,9 @@ class MaplibreLayer extends MapLibreLayer {
             return this.url;
         }
         // If the user has defined the style by the maplibreOptions, we use it directly.
-        if ((_b = (_a = this.get('options')) === null || _a === void 0 ? void 0 : _a.mapLibreOptions) === null || _b === void 0 ? void 0 : _b.style) {
-            return this.get('options').mapLibreOptions.style;
+        const opts = this.get('options');
+        if ((_a = opts === null || opts === void 0 ? void 0 : opts.mapLibreOptions) === null || _a === void 0 ? void 0 : _a.style) {
+            return opts.mapLibreOptions.style;
         }
         /// Otherwise build the complete style url.
         return buildStyleUrl(this.url, this.style, this.apiKey, this.apiKeyName);

package/ol/renderers/MaplibreLayerRenderer.js

@@ -33,6 +33,7 @@ export default class MaplibreLayerRenderer extends MapLibreLayerRenderer {
         return container;
     }
     setIsReady() {
+        console.log('ici');
         if (!this.ready) {
             this.ready = true;
             this.ignoreNextRender = true;

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": "3.1.2",
+  "version": "3.2.0-beta.0",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "exports": {
     ".": "./index.js",
@@ -28,7 +28,7 @@
     "@babel/preset-typescript": "^7.26.0",
     "@commitlint/cli": "19.6.1",
     "@commitlint/config-conventional": "19.6.0",
-    "@geops/eslint-config-react": "^1.4.0",
+    "@geops/eslint-config-react": "1.5.0-beta.0",
     "@types/geojson": "7946.0.16",
     "@types/lodash": "^4.17.15",
     "@types/lodash.debounce": "4.0.9",
@@ -47,14 +47,6 @@
     "esdoc-standard-plugin": "1.0.0",
     "esdoc-typescript-plugin": "1.0.1",
     "eslint": "9.19.0",
-    "eslint-config-airbnb": "19.0.4",
-    "eslint-config-airbnb-typescript": "18.0.0",
-    "eslint-config-prettier": "10.0.1",
-    "eslint-plugin-cypress": "4.1.0",
-    "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-jsx-a11y": "6.10.2",
-    "eslint-plugin-prettier": "5.2.3",
-    "eslint-plugin-react": "7.37.4",
     "fixpack": "4.0.0",
     "husky": "9.1.7",
     "is-ci": "4.1.0",
@@ -70,7 +62,7 @@
     "mock-socket": "9.3.1",
     "next": "15.1.6",
     "next-transpile-modules": "10.0.1",
-    "ol": "10.3.1",
+    "ol": "10.4.0",
     "openapi-typescript": "6.7.5",
     "prettier": "3.4.2",
     "raw-loader": "4.0.2",
@@ -80,7 +72,7 @@
     "stylelint": "16.14.1",
     "stylelint-config-recommended-scss": "14.1.0",
     "stylelint-config-standard": "37.0.0",
-    "stylelint-scss": "6.10.1",
+    "stylelint-scss": "6.11.0",
     "ts-jest": "^29.2.5",
     "typescript": "5.7.3",
     "vite": "^6.0.11"

package/types/index.d.ts

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

package/types/realtime.d.ts

@@ -1,64 +1,23 @@
 import { Feature, FeatureCollection, Point } from 'geojson';
 
-export declare type RealtimeMode = 'raw' | 'schematic' | 'topographic';
-
 export declare type RealtimeChannelModeSuffix = '_schematic' | '';
 
-export type RealtimeTrainId = string;
-
-export type RealtimeStationId = number;
-
-export type RealtimeService =
-  | 'redis_websocket_api'
-  | 'tralis_fzo'
-  | 'tralis_geofox'
-  | 'tralis_newsticker'
-  | 'tralis_stations'
-  | 'tralis_vdv'
-  | 'tralis_worker'
-  | string;
-
-export type RealtimeTenant = '' | 'sbb' | 'sbh' | 'sbm' | string;
-
-export type RealtimeElevatorState = 'ALL_OPERABLE' | string;
-
-export type RealtimeStopState = 'BOARDING' | 'LEAVING' | string;
-
-export type RealtimeTrajectoryState =
-  | 'BOARDING'
-  | 'HIDDEN'
-  | 'JOURNEY_CANCELLED'
-  | 'STOP_CANCELLED';
-
-export type RealtimeGeneralizationLevel = 10 | 100 | 30 | 5;
-
-export type RealtimeMot =
-  | 'bus'
-  | 'cablecar'
-  | 'coach'
-  | 'ferry'
-  | 'funicular'
-  | 'gondola'
-  | 'rail'
-  | 'subway'
-  | 'tram';
+export declare type RealtimeMode = 'raw' | 'schematic' | 'topographic';
 
 /**
  * @type RealtimeBbox
  */
 export type RealtimeBbox = (number | string)[];
-// minX: number,
-// minY: number,
-// maxX: number,
-// maxY: number,
-// zoom: number,
-// string?,
-// `gen_level=${RealtimeGeneralizationLevel}`| undefined,
-// `tenant=${UnionConcat<RealtimeTenant, ','>}`!,
-// `mots=${UnionConcat<RealtimeMot, ','>}`!,
 
 export type RealtimeBuffer = [number, number];
 
+export interface RealtimeBufferResponse {
+  client_reference: '';
+  content: RealtimeTrajectoryResponse[];
+  source: 'buffer';
+  timestamp: number;
+}
+
 export type RealtimeChannelName =
   | 'buffer'
   | 'extra_geoms'
@@ -71,54 +30,79 @@ export type RealtimeChannelName =
   | `timetable_${RealtimeStationId}`
   | `trajectory${RealtimeChannelModeSuffix}`;
 
-export interface RealtimeTrajectoryProperties {
-  // Tralis and trafimage
-  bounds: [number, number, number, number];
+export interface RealtimeDeletedVehiclesResponse {
+  client_reference: null;
+  content: string;
+  source: `deleted_vehicles${RealtimeChannelModeSuffix}`;
+  timestamp: number;
+}
 
-  // Only after first rendering on a map
-  coordinate?: [number, number];
+export interface RealtimeDeparture {
+  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;
+  ris_aimed_time: number;
+  ris_estimated_time: number;
+  state: string; /// (BOARDING|STOP_CANCELLED|JOURNEY_CANCELLED|HIDDEN)/
+  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;
+}
 
-  delay: null | number;
+export interface RealtimeDepartureExtended extends RealtimeDeparture {
+  cancelled?: boolean; // value generated by RealtimeAPI class
+}
 
-  // 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;
-  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];
+export type RealtimeElevatorState = 'ALL_OPERABLE' | string;
 
-  raw_time?: string;
-  ride_state?: string;
+export interface RealtimeExtraGeom extends Feature {
+  properties: RealtimeExtraGeomProperties;
+}
 
-  route_identifier: string;
-  routeIdentifier?: string;
-  state: RealtimeTrajectoryState;
-  tenant: string;
-  time_intervals?: number[][];
-  time_since_update?: string;
+export interface RealtimeExtraGeomDeleted {
+  properties: RealtimeExtraGeomProperties;
+  type: 'Deleted';
+}
+// minX: number,
+// minY: number,
+// maxX: number,
+// maxY: number,
+// zoom: number,
+// string?,
+// `gen_level=${RealtimeGeneralizationLevel}`| undefined,
+// `tenant=${UnionConcat<RealtimeTenant, ','>}`!,
+// `mots=${UnionConcat<RealtimeMot, ','>}`!,
+
+export interface RealtimeExtraGeomProperties {
+  ref: number | string;
+}
+
+export type RealtimeExtraGeoms = Record<string, Feature[]>;
+
+export interface RealtimeExtraGeomsResponse {
+  client_reference: null;
+  content: RealtimeExtraGeom | RealtimeExtraGeomDeleted;
+  source: `extra_geoms`;
   timestamp: number;
-  train_id?: RealtimeTrainId;
-  train_number?: number;
-  transmitting_vehicle?: string;
-  type: RealtimeMots;
 }
 
-export interface RealtimeTrajectory extends Feature {
-  properties: RealtimeTrajectoryProperties;
+export interface RealtimeFullTrajectory extends FeatureCollection {
+  properties: RealtimeFullTrajectoryProperties;
 }
 
 export interface RealtimeFullTrajectoryProperties {
@@ -135,8 +119,96 @@ export interface RealtimeFullTrajectoryProperties {
   train_id: RealtimeTrainId;
 }
 
-export interface RealtimeFullTrajectory extends FeatureCollection {
-  properties: RealtimeFullTrajectoryProperties;
+export type RealtimeGeneralizationLevel = 10 | 100 | 30 | 5;
+
+export interface RealtimeHealth {
+  heathly: boolean;
+  service: RealtimeService;
+  tenant: null | string;
+}
+
+export interface RealtimeHealthCheckResponse {
+  client_reference: null;
+  content: RealtimeHealth;
+  source: 'healthcheck';
+  timestamp: number;
+}
+
+export interface RealtimeLine {
+  color: string;
+  id: number;
+  name: string;
+  stroke: string;
+  text_color: string;
+}
+
+export type RealtimeMot =
+  | 'bus'
+  | 'cablecar'
+  | 'coach'
+  | 'ferry'
+  | 'funicular'
+  | 'gondola'
+  | 'rail'
+  | 'subway'
+  | 'tram';
+
+export interface RealtimeNews {
+  incident_program: boolean;
+  messages: RealtimeNewsMessage[];
+}
+
+export interface RealtimeNewsMessage {
+  content: string;
+  lines: RealtimeLine[];
+  title: string;
+  updated: string; // TODO: ISO string
+}
+
+export interface RealtimeNewsTickerResponse {
+  client_reference: null;
+  content: RealtimeNews;
+  source: `${RealtimeTenant}_newsticker`;
+  timestamp: number;
+}
+
+export type RealtimeService =
+  | 'redis_websocket_api'
+  | 'tralis_fzo'
+  | 'tralis_geofox'
+  | 'tralis_newsticker'
+  | 'tralis_stations'
+  | 'tralis_vdv'
+  | 'tralis_worker'
+  | string;
+
+export interface RealtimeStation extends Feature {
+  geometry: Point;
+  properties: RealtimeStationproperties;
+}
+
+export type RealtimeStationId = number;
+
+export interface RealtimeStationproperties extends Feature {
+  elevatorOutOfOrder: boolean;
+  elevators: object;
+  elevatorState: RealtimeElevatorState;
+  hasAccessibility: boolean;
+  hasAirport: boolean;
+  hasElevator: boolean;
+  hasZOB: boolean;
+  name: string;
+  networkLines: RealtimeLine[];
+  tenant: RealtimeTenant;
+  transfers: RealtimeTransfer[];
+  uic: RealtimeStationId;
+}
+
+export interface RealtimeStationResponse {
+  client_reference: null;
+  content: RealtimeNews;
+  source: `station_${RealtimeStationId}`;
+  timestamp: number;
 }
 
 export interface RealtimeStop {
@@ -178,129 +250,74 @@ export interface RealtimeStopSequence {
   vehicleType: number;
 }
 
-export interface RealtimeExtraGeomProperties {
-  ref: number | string;
-}
-
-export interface RealtimeExtraGeom extends Feature {
-  properties: RealtimeExtraGeomProperties;
-}
-
-export interface RealtimeExtraGeomDeleted {
-  properties: RealtimeExtraGeomProperties;
-  type: 'Deleted';
-}
-
-export type RealtimeExtraGeoms = Record<string, Feature[]>;
-
-export interface RealtimeLine {
-  color: string;
-  id: number;
-  name: string;
-  stroke: string;
-  text_color: string;
-}
-
-export interface RealtimeTransfer {
-  lines: string[];
-  mot: RealtimeMot;
+export interface RealtimeStopSequenceResponse {
+  client_reference: '';
+  content: RealtimeStopSequence[];
+  source: `stopsequence_${RealtimeTenant}_${RealtimeTrainId}`;
+  timestamp: number;
 }
 
-export interface RealtimeStationproperties extends Feature {
-  elevatorOutOfOrder: boolean;
-  elevators: object;
-  elevatorState: RealtimeElevatorState;
-  hasAccessibility: boolean;
-  hasAirport: boolean;
-  hasElevator: boolean;
-  hasZOB: boolean;
-  name: string;
-  networkLines: RealtimeLine[];
-  tenant: RealtimeTenant;
-  transfers: RealtimeTransfer[];
-  uic: RealtimeStationId;
-}
+export type RealtimeStopState = 'BOARDING' | 'LEAVING' | string;
 
-export interface RealtimeStation extends Feature {
-  geometry: Point;
-  properties: RealtimeStationproperties;
-}
+export type RealtimeTenant = '' | 'sbb' | 'sbh' | 'sbm' | string;
 
-export interface RealtimeDeparture {
-  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;
-  ris_aimed_time: number;
-  ris_estimated_time: number;
-  state: string; /// (BOARDING|STOP_CANCELLED|JOURNEY_CANCELLED|HIDDEN)/
-  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 RealtimeTimetableResponse {
+  client_reference: null;
+  content: RealtimeDeparture;
+  source: `timetable_${RealtimeStationId}`;
+  timestamp: number;
 }
 
-export interface RealtimeDepartureExtended extends RealtimeDeparture {
-  cancelled?: boolean; // value generated by RealtimeAPI class
-}
+export type RealtimeTrainId = string;
 
-export interface RealtimeNewsMessage {
-  content: string;
-  lines: RealtimeLine[];
-  title: string;
-  updated: string; // TODO: ISO string
+export interface RealtimeTrajectory extends Feature {
+  properties: RealtimeTrajectoryProperties;
 }
 
-export interface RealtimeNews {
-  incident_program: boolean;
-  messages: RealtimeNewsMessage[];
-}
+export interface RealtimeTrajectoryProperties {
+  // Tralis and trafimage
+  bounds: [number, number, number, number];
 
-export interface RealtimeHealth {
-  heathly: boolean;
-  service: RealtimeService;
-  tenant: null | string;
-}
+  // Only after first rendering on a map
+  coordinate?: [number, number];
 
-export interface RealtimeExtraGeomsResponse {
-  client_reference: null;
-  content: RealtimeExtraGeom | RealtimeExtraGeomDeleted;
-  source: `extra_geoms`;
-  timestamp: number;
-}
+  delay: null | number;
 
-export interface RealtimeStationResponse {
-  client_reference: null;
-  content: RealtimeNews;
-  source: `station_${RealtimeStationId}`;
-  timestamp: 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;
+  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];
 
-export interface RealtimeNewsTickerResponse {
-  client_reference: null;
-  content: RealtimeNews;
-  source: `${RealtimeTenant}_newsticker`;
-  timestamp: number;
-}
+  raw_time?: string;
+  ride_state?: string;
 
-export interface RealtimeTimetableResponse {
-  client_reference: null;
-  content: RealtimeDeparture;
-  source: `timetable_${RealtimeStationId}`;
+  route_identifier: string;
+  routeIdentifier?: string;
+  state: RealtimeTrajectoryState;
+  tenant: string;
+  time_intervals?: number[][];
+  time_since_update?: string;
   timestamp: number;
+  train_id?: RealtimeTrainId;
+  train_number?: number;
+  transmitting_vehicle?: string;
+  type: RealtimeMots;
 }
 
 export interface RealtimeTrajectoryResponse {
@@ -310,30 +327,13 @@ export interface RealtimeTrajectoryResponse {
   timestamp: number;
 }
 
-export interface RealtimeStopSequenceResponse {
-  client_reference: '';
-  content: RealtimeStopSequence[];
-  source: `stopsequence_${RealtimeTenant}_${RealtimeTrainId}`;
-  timestamp: number;
-}
-
-export interface RealtimeBufferResponse {
-  client_reference: '';
-  content: RealtimeTrajectoryResponse[];
-  source: 'buffer';
-  timestamp: number;
-}
-
-export interface RealtimeDeletedVehiclesResponse {
-  client_reference: null;
-  content: string;
-  source: `deleted_vehicles${RealtimeChannelModeSuffix}`;
-  timestamp: number;
-}
+export type RealtimeTrajectoryState =
+  | 'BOARDING'
+  | 'HIDDEN'
+  | 'JOURNEY_CANCELLED'
+  | 'STOP_CANCELLED';
 
-export interface RealtimeHealthCheckResponse {
-  client_reference: null;
-  content: RealtimeHealth;
-  source: 'healthcheck';
-  timestamp: number;
+export interface RealtimeTransfer {
+  lines: string[];
+  mot: RealtimeMot;
 }