mobility-toolbox-js 3.0.0-beta.2 → 3.0.0-beta.20

package/ol/utils/getFeatureInfoAtCoordinate.js

@@ -19,11 +19,11 @@ const format = new GeoJSON();
  */
 const getFeaturesFromWMS = (source, options, abortController) => {
     let url;
-    const { coordinate, resolution, projection, params } = options;
+    const { coordinate, params, projection, resolution } = options;
     if (source && resolution && projection) {
         url = source.getFeatureInfoUrl(coordinate, resolution, projection, Object.assign({ info_format: 'application/json', query_layers: source.getParams().layers }, params));
     }
-    // @ts-ignore
+    // @ts-expect-error
     return fetch(url, { signal: abortController.signal })
         .then((resp) => resp.json())
         .then((featureCollection) => format.readFeatures(featureCollection))
@@ -36,7 +36,7 @@ let abortControllers = {};
 /**
  * @private
  */
-const getFeatureInfoAtCoordinate = (coordinate, layers, hitTolerance = 5) => __awaiter(void 0, void 0, void 0, function* () {
+const getFeatureInfoAtCoordinate = (coordinate_1, layers_1, ...args_1) => __awaiter(void 0, [coordinate_1, layers_1, ...args_1], void 0, function* (coordinate, layers, hitTolerance = 5) {
     // Kill all previous requests
     Object.values(abortControllers).forEach((abortController) => {
         abortController === null || abortController === void 0 ? void 0 : abortController.abort();
@@ -47,48 +47,44 @@ const getFeatureInfoAtCoordinate = (coordinate, layers, hitTolerance = 5) => __a
         var _a, _b, _c, _d;
         const map = layer.getMapInternal();
         const projection = (_b = (_a = map === null || map === void 0 ? void 0 : map.getView()) === null || _a === void 0 ? void 0 : _a.getProjection()) === null || _b === void 0 ? void 0 : _b.getCode();
-        const emptyResponse = { features: [], layer, coordinate };
+        const emptyResponse = { coordinate, features: [], layer };
         if (!projection) {
             return Promise.resolve(emptyResponse);
         }
         // For backward compatibility
-        // @ts-ignore
         if (layer.getFeatureInfoAtCoordinate) {
-            return (layer
-                // @ts-ignore
-                .getFeatureInfoAtCoordinate(coordinate));
+            return layer.getFeatureInfoAtCoordinate(coordinate);
         }
         // WMS sources
         // Here we don't use instanceof, to be able to use this function if a layer comes from 2 different ol versions.
         const source = layer === null || layer === void 0 ? void 0 : layer.getSource();
-        // @ts-ignore
         if (source === null || source === void 0 ? void 0 : source.getFeatureInfoUrl) {
-            const id = getUid(this);
+            const id = getUid(layer);
             // Abort and recreates one controller per layer
             (_c = abortControllers[id]) === null || _c === void 0 ? void 0 : _c.abort();
             abortControllers[id] = new AbortController();
             const resolution = (_d = map === null || map === void 0 ? void 0 : map.getView()) === null || _d === void 0 ? void 0 : _d.getResolution();
             return getFeaturesFromWMS(source, {
                 coordinate,
-                resolution,
-                projection,
                 params: {
                     info_format: 'application/json',
                     query_layers: source.getParams().layers,
                 },
+                projection,
+                resolution,
             }, abortControllers[id])
                 .then((features) => {
                 return {
+                    coordinate,
                     features,
                     layer,
-                    coordinate,
                 };
             })
                 .catch(() => {
                 return {
+                    coordinate,
                     features: [],
                     layer,
-                    coordinate,
                 };
             });
         }
@@ -99,15 +95,13 @@ const getFeatureInfoAtCoordinate = (coordinate, layers, hitTolerance = 5) => __a
             return Promise.resolve(emptyResponse);
         }
         const features = map === null || map === void 0 ? void 0 : map.getFeaturesAtPixel(pixel, {
+            hitTolerance: layer.get('hitTolerance') || hitTolerance || 5,
             layerFilter: (l) => l === layer,
-            hitTolerance: 
-            // @ts-ignore
-            layer.get('hitTolerance') || hitTolerance || 5,
         });
         return Promise.resolve({
+            coordinate,
             features,
             layer,
-            coordinate,
         });
     });
     return Promise.all(promises);

package/ol/utils/index.d.ts

@@ -0,0 +1 @@
+export { default as getFeatureInfoAtCoordinate } from "./getFeatureInfoAtCoordinate";

package/package.json

@@ -2,9 +2,8 @@
   "name": "mobility-toolbox-js",
   "license": "MIT",
   "description": "Toolbox for JavaScript applications in the domains of mobility and logistics.",
-  "version": "3.0.0-beta.2",
+  "version": "3.0.0-beta.20",
   "homepage": "https://mobility-toolbox-js.geops.io/",
-  "module": "index.js",
   "exports": {
     ".": "./index.js",
     "./api": "./api/index.js",
@@ -13,32 +12,34 @@
     "./types": "./types/index.d.ts"
   },
   "dependencies": {
-    "@turf/helpers": "6.5.0",
-    "@turf/transform-rotate": "6.5.0",
+    "@geoblocks/ol-maplibre-layer": "^1.0.0",
+    "@turf/helpers": "7.0.0",
+    "@turf/transform-rotate": "7.0.0",
     "lodash.debounce": "4.0.8",
     "lodash.throttle": "4.1.1",
-    "uuid": "9.0.1"
+    "uuid": "10.0.0"
   },
   "peerDependencies": {
     "maplibre-gl": ">=1",
     "ol": ">=7"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.24.0",
-    "@babel/preset-typescript": "^7.23.3",
-    "@commitlint/cli": "19.0.3",
-    "@commitlint/config-conventional": "19.0.3",
+    "@babel/preset-env": "^7.24.7",
+    "@babel/preset-typescript": "^7.24.7",
+    "@commitlint/cli": "19.3.0",
+    "@commitlint/config-conventional": "19.2.2",
+    "@geops/eslint-config-react": "^1.0.2",
     "@types/geojson": "7946.0.14",
     "@types/lodash.debounce": "4.0.9",
     "@types/lodash.throttle": "4.1.9",
     "@types/mapbox-gl": "3.1.0",
     "@types/offscreencanvas": "2019.7.3",
     "@types/topojson": "3.2.6",
-    "@types/uuid": "9.0.8",
-    "@typescript-eslint/eslint-plugin": "7.1.0",
-    "@typescript-eslint/parser": "7.1.0",
-    "cypress": "13.6.6",
-    "esbuild": "0.20.1",
+    "@types/uuid": "10.0.0",
+    "@typescript-eslint/eslint-plugin": "7.14.1",
+    "@typescript-eslint/parser": "7.14.1",
+    "cypress": "13.12.0",
+    "esbuild": "0.21.5",
     "esdoc": "1.1.0",
     "esdoc-ecmascript-proposal-plugin": "1.0.0",
     "esdoc-publish-html-plugin": "1.1.2",
@@ -46,13 +47,13 @@
     "esdoc-typescript-plugin": "1.0.1",
     "eslint": "8.57.0",
     "eslint-config-airbnb": "19.0.4",
-    "eslint-config-airbnb-typescript": "17.1.0",
+    "eslint-config-airbnb-typescript": "18.0.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-cypress": "2.15.1",
+    "eslint-plugin-cypress": "3.3.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-jsx-a11y": "6.8.0",
+    "eslint-plugin-jsx-a11y": "6.9.0",
     "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react": "7.34.3",
     "fixpack": "4.0.0",
     "husky": "9.0.11",
     "is-ci": "3.0.1",
@@ -63,24 +64,23 @@
     "jest-serializer-html": "7.1.0",
     "jest-transformer-svg": "2.0.2",
     "jest-websocket-mock": "2.5.0",
-    "lint-staged": "15.2.2",
-    "maplibre-gl": "4.0.2",
+    "lint-staged": "15.2.7",
+    "maplibre-gl": "4.5.0",
     "mock-socket": "9.3.1",
-    "next": "14.1.0",
+    "next": "14.2.4",
     "next-transpile-modules": "10.0.1",
-    "ol": "9.0.0",
-    "openapi-typescript": "6.7.4",
-    "prettier": "3.2.5",
+    "ol": "9.2.4",
+    "openapi-typescript": "6.7.5",
+    "prettier": "3.3.2",
     "raw-loader": "4.0.2",
     "sort-json": "2.0.1",
     "standard-version": "9.5.0",
-    "start-server-and-test": "2.0.3",
-    "stylelint": "16.2.1",
+    "start-server-and-test": "2.0.4",
+    "stylelint": "16.6.1",
     "stylelint-config-recommended-scss": "14.0.0",
-    "stylelint-config-standard": "36.0.0",
-    "stylelint-scss": "6.1.0",
-    "typedoc": "^0.25.9",
-    "typescript": "5.3.3"
+    "stylelint-config-standard": "36.0.1",
+    "stylelint-scss": "6.3.2",
+    "typescript": "5.5.2"
   },
   "scripts": {
     "apidoc": "esdoc && cp apidoc/index.json doc/src/components/Esdoc",
@@ -102,7 +102,7 @@
     "esbuild:iife:base": "esbuild src/iife.js --bundle --sourcemap --target=chrome100",
     "esbuild:iife:minify": "yarn esbuild:iife:base --minify --outfile=build/mbt.min.js",
     "esbuild:iife:unminify": "yarn esbuild:iife:base --outfile=build/mbt.js",
-    "format": "prettier --write 'src/**/*.js' && eslint 'src/**/*.js' --fix && stylelint 'src/**/*.css' 'src/**/*.scss' --fix --allow-empty-input",
+    "format": "prettier --write 'src/**/*.js' && eslint src/**/*.js src/**/*.ts --fix && stylelint 'src/**/*.css' 'src/**/*.scss' --fix --allow-empty-input",
     "lib": "REACT_APP_LIB_MODE=1  webpack --mode production",
     "lib:dev": "REACT_APP_LIB_MODE=1  webpack --mode development",
     "link2": "cmdToAdd=$(node ./scripts/read-pkg-json.js add) && $cmdToAdd && yarn build && cmdToRemove=$(node ./scripts/read-pkg-json.js remove) && $cmdToRemove && cd build && yarn link",

package/setupTests.d.ts

@@ -0,0 +1 @@
+export {};

package/setupTests.js

@@ -1,10 +1,9 @@
-/* eslint-disable import/no-extraneous-dependencies */
-import 'jest-canvas-mock';
-import fetchTrajectoryByIdResponse from '../data/fetchTrajectoryById.json';
+import fetchRouteResponse from '../data/fetchRoute.json';
 import fetchTrajectoriesResponse from '../data/fetchTrajectories.json';
+import fetchTrajectoryByIdResponse from '../data/fetchTrajectoryById.json';
 import fetchTrajectoryStationsResponse from '../data/fetchTrajectoryStations.json';
 import stopsSearchResponse from '../data/stopsSearch.json';
-import fetchRouteResponse from '../data/fetchRoute.json';
+import 'jest-canvas-mock';
 global.fetchTrajectoryByIdResponse = fetchTrajectoryByIdResponse;
 global.fetchTrajectoriesResponse = fetchTrajectoriesResponse;
 global.fetchTrajectoryStationsResponse = fetchTrajectoryStationsResponse;

package/types/common.d.ts

@@ -2,55 +2,58 @@ 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 CommonLayer, {
+  LayerCommonOptions,
+} from '../ol/mixins/PropertiesLayerMixin';
+
 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;
-};
+}
 
-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 +64,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,46 +78,51 @@ 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 AnyMap = MapboxMap | MaplibreMap | OlMap;
+export type AnyLayer = MbLayer | OlLayer;
 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;
+  | null
+  | OffscreenCanvasRenderingContext2D
+  | undefined;
 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>;
 
+type GConstructor3<T = object> = new (...args: any[]) => T;
+export type AnyLayerable = GConstructor3<Omit<AnyLayer, keyof string>>;
+
 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[];
+export interface LayerGetFeatureInfoResponse {
   coordinate: Coordinate;
-};
+  features: Feature[];
+  layer: Layer;
+}
 
-export type LayerGetFeatureInfoOptions = {
-  resolution: number;
+export interface LayerGetFeatureInfoOptions {
   nb?: number;
-};
+  resolution: number;
+}
 
 export type UserInteractionCallback = (
   features: Feature[],
@@ -126,4 +133,4 @@ export type UserInteractionCallback = (
 
 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'];