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

package/ol/styles/routingStyle.js

@@ -1,24 +1,21 @@
 import { Circle, Fill, Stroke } from 'ol/style';
 import Style from 'ol/style/Style';
-/** @private */
 const circleStyle = new Circle({
-    radius: 6,
     fill: new Fill({
         color: [255, 0, 0, 1],
     }),
+    radius: 6,
     stroke: new Stroke({
         color: [0, 0, 0, 1],
         width: 1,
     }),
 });
-/** @private */
 const blackBorder = new Style({
     stroke: new Stroke({
         color: [0, 0, 0, 1],
         width: 5,
     }),
 });
-/** @private */
 const redLine = new Style({
     image: circleStyle,
     stroke: new Stroke({
@@ -26,27 +23,33 @@ const redLine = new Style({
         width: 3,
     }),
 });
-/** @private */
 const dashedRedLine = new Style({
     image: circleStyle,
     stroke: new Stroke({
         color: [255, 0, 0, 1],
-        width: 3,
         lineDash: [1, 10],
+        width: 3,
     }),
 });
-/** @private */
 const routingStyle = (feature, resolution) => {
+    var _a;
     const minResolution = feature.get('minResolution');
     const maxResolution = feature.get('maxResolution');
     const inRange = resolution <= minResolution && resolution > maxResolution;
     if (minResolution && maxResolution && !inRange) {
         return [];
     }
+    const zIndex = ((_a = feature === null || feature === void 0 ? void 0 : feature.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'Point' ? 100 : 0;
+    let styles = [blackBorder, redLine];
     const mot = feature.get('mot');
-    if (mot !== 'foot') {
-        return [blackBorder, redLine];
+    if (mot === 'foot') {
+        styles = [dashedRedLine];
     }
-    return [dashedRedLine];
+    styles = styles.map((style) => {
+        const tmp = style.clone();
+        tmp.setZIndex(zIndex);
+        return tmp;
+    });
+    return styles;
 };
 export default routingStyle;

package/ol/utils/defineDeprecatedProperties.d.ts

@@ -0,0 +1,10 @@
+import { Layer } from 'ol/layer';
+import { MobilityLayerOptions } from '../layers/Layer';
+/**
+ * obj function defines properties taht were used in mbt v2.
+ * They are all marked als deprecated.
+ * @param obj
+ * @returns
+ */
+declare const defineDeprecatedProperties: (obj: Layer, options: MobilityLayerOptions) => void;
+export default defineDeprecatedProperties;

package/ol/utils/defineDeprecatedProperties.js

@@ -0,0 +1,180 @@
+import debounce from 'lodash.debounce';
+let deprecated = () => { };
+if (typeof window !== 'undefined' &&
+    new URLSearchParams(window.location.search).get('deprecated')) {
+    deprecated = debounce((message) => {
+        // eslint-disable-next-line no-console
+        console.warn(message);
+    }, 1000);
+}
+const onChildrenChange = (layer, oldValue) => {
+    // Set the parent property
+    (oldValue || []).forEach((child) => {
+        child.set('parent', undefined);
+    });
+    (layer.get('children') || []).forEach((child) => {
+        child.set('parent', this);
+    });
+};
+/**
+ * obj function defines properties taht were used in mbt v2.
+ * They are all marked als deprecated.
+ * @param obj
+ * @returns
+ */
+const defineDeprecatedProperties = (obj, options) => {
+    if (options.properties) {
+        deprecated("Deprecated. Don't use properties options. Pass the values directly in options object.");
+        obj.setProperties(options.properties);
+    }
+    // Update parent property
+    obj.on('propertychange', (evt) => {
+        if (evt.key === 'children') {
+            onChildrenChange(evt.target, evt.oldValue);
+        }
+        if (evt.key === 'map') {
+            const map = evt.target.get(evt.key);
+            if (map) {
+                (evt.target.get('children') || []).forEach((child) => {
+                    map.addLayer(child);
+                });
+            }
+            else if (evt.oldValue) {
+                (evt.target.get('children') || []).forEach((child) => {
+                    evt.oldValue.removeLayer(child);
+                });
+            }
+        }
+    });
+    // Save options for cloning
+    obj.set('options', options);
+    obj.set('children', options.children || []); // Trigger the on children change event
+    Object.defineProperties(obj, {
+        children: {
+            /** @deprecated */
+            get: () => {
+                deprecated("Layer.children is deprecated. Use the Layer.get('children') method instead.");
+                return obj.get('children') || [];
+            },
+            /** @deprecated */
+            set: (newValue) => {
+                deprecated("Layer.children is deprecated. Use the Layer.set('children', children) method instead.");
+                obj.set('children', newValue || []);
+            },
+        },
+        copyrights: {
+            /** @deprecated */
+            get: () => {
+                deprecated('Layer.copyrights is deprecated. Get the attributions from the source object');
+                return obj.get('copyrights');
+            },
+            /** @deprecated */
+            set: (newCopyrights) => {
+                deprecated('Layer.copyrights is deprecated. Set the attributions to the source object.');
+                const arrValue = newCopyrights && !Array.isArray(newCopyrights)
+                    ? [newCopyrights]
+                    : newCopyrights;
+                obj.set('copyrights', arrValue || []);
+            },
+        },
+        disabled: {
+            /** @deprecated */
+            get() {
+                deprecated("Layer.disabled is deprecated. Use the Layer.get('disabled') method instead.");
+                return obj.get('disabled');
+            },
+            /** @deprecated */
+            set(newValue) {
+                deprecated("Layer.disabled is deprecated. Use the Layer.set('disabled', newValue) method instead.");
+                obj.set('disabled', newValue);
+            },
+        },
+        group: {
+            /** @deprecated */
+            get() {
+                deprecated("Layer.group is deprecated. Use the Layer.get('group') method instead.");
+                return obj.get('group');
+            },
+        },
+        hitTolerance: {
+            /** @deprecated */
+            get() {
+                deprecated('Layer.hitTolerance is deprecated. Pass the hitTolerance when you request the features.');
+                return obj.get('hitTolerance') || 5;
+            },
+            /** @deprecated */
+            set(newValue) {
+                deprecated('Layer.hitTolerance is deprecated. Pass the hitTolerance when you request the features.');
+                obj.set('hitTolerance', newValue);
+            },
+        },
+        key: {
+            /** @deprecated */
+            get() {
+                deprecated('Layer.key is deprecated. Use the Layer.get("key") method instead.');
+                return obj.get('key') || obj.get('name');
+            },
+        },
+        map: {
+            /** @deprecated */
+            get() {
+                deprecated('Layer.map is deprecated. Use the Layer.get("map") method instead.');
+                return obj.getMapInternal();
+            },
+        },
+        name: {
+            /** @deprecated */
+            get() {
+                deprecated("Layer.name is deprecated. Use the Layer.get('name') method instead.");
+                return obj.get('name');
+            },
+        },
+        olLayer: {
+            /** @deprecated */
+            get() {
+                deprecated("Layer.olLayer is deprecated. mobility-toolbox-js/ol layers inherits now from ol/layer/Layer class. obj getter is only a redirect to the current 'this' object.");
+                return obj;
+            },
+            /** @deprecated */
+            set() {
+                deprecated('Layer.olLayer is deprecated. mobility-toolbox-js/ol layers inherits now from ol/layer/Layer class. obj setter has no effect.');
+            },
+        },
+        options: {
+            /** @deprecated */
+            get() {
+                deprecated('Layer.options is deprecated. Use the Layer.get("options") method instead.');
+                return obj.get('options');
+            },
+            set(newValue) {
+                deprecated('Layer.options is deprecated.  Use the Layer.set("options", newValue) method instead.');
+                return obj.set('options', newValue);
+            },
+        },
+        parent: {
+            /** @deprecated */
+            get() {
+                deprecated("Layer.parent is deprecated. Use the Layer.get('parent') method instead.");
+                return obj.get('parent');
+            },
+            /** @deprecated */
+            set(newValue) {
+                deprecated("Layer.parent is deprecated. Use the Layer.set('parent', parent) method instead.");
+                obj.set('parent', newValue);
+            },
+        },
+        visible: {
+            /** @deprecated */
+            get() {
+                deprecated('Layer.visible is deprecated. Use the Layer.getVisible() method instead.');
+                return obj.getVisible();
+            },
+            /** @deprecated */
+            set(newValue) {
+                deprecated('Layer.visible is deprecated. Use the Layer.setVisible(newValue) method instead.');
+                obj.setVisible(newValue);
+            },
+        },
+    });
+};
+export default defineDeprecatedProperties;

package/ol/utils/getFeatureInfoAtCoordinate.d.ts

@@ -1,6 +1,6 @@
+import { LayerGetFeatureInfoResponse } from '../../types';
 import type { Coordinate } from 'ol/coordinate';
 import type { Layer } from 'ol/layer';
-import { LayerGetFeatureInfoResponse } from '../../types';
 /**
  * @private
  */

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,21 +47,17 @@ 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(layer);
             // Abort and recreates one controller per layer
@@ -70,25 +66,25 @@ const getFeatureInfoAtCoordinate = (coordinate, layers, hitTolerance = 5) => __a
             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/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.9",
+  "version": "3.0.0",
   "homepage": "https://mobility-toolbox-js.geops.io/",
-  "module": "index.js",
   "exports": {
     ".": "./index.js",
     "./api": "./api/index.js",
@@ -13,32 +12,35 @@
     "./types": "./types/index.d.ts"
   },
   "dependencies": {
-    "@turf/helpers": "6.5.0",
-    "@turf/transform-rotate": "6.5.0",
+    "@geoblocks/ol-maplibre-layer": "^1.0.2",
+    "@turf/helpers": "7.1.0",
+    "@turf/transform-rotate": "7.1.0",
     "lodash.debounce": "4.0.8",
     "lodash.throttle": "4.1.1",
-    "uuid": "9.0.1"
+    "uuid": "11.0.3"
   },
   "peerDependencies": {
-    "maplibre-gl": ">=1",
-    "ol": ">=7"
+    "maplibre-gl": ">=4",
+    "ol": ">=9"
   },
   "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.26.0",
+    "@babel/preset-typescript": "^7.26.0",
+    "@commitlint/cli": "19.6.0",
+    "@commitlint/config-conventional": "19.6.0",
+    "@geops/eslint-config-react": "^1.3.2",
     "@types/geojson": "7946.0.14",
+    "@types/lodash": "^4.17.13",
     "@types/lodash.debounce": "4.0.9",
     "@types/lodash.throttle": "4.1.9",
-    "@types/mapbox-gl": "3.1.0",
+    "@types/mapbox-gl": "3.4.1",
     "@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": "8.17.0",
+    "@typescript-eslint/parser": "8.17.0",
+    "cypress": "13.16.1",
+    "esbuild": "0.24.0",
     "esdoc": "1.1.0",
     "esdoc-ecmascript-proposal-plugin": "1.0.0",
     "esdoc-publish-html-plugin": "1.1.2",
@@ -46,15 +48,15 @@
     "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-import": "2.29.1",
-    "eslint-plugin-jsx-a11y": "6.8.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-cypress": "3.5.0",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-jsx-a11y": "6.10.2",
+    "eslint-plugin-prettier": "5.2.1",
+    "eslint-plugin-react": "7.37.2",
     "fixpack": "4.0.0",
-    "husky": "9.0.11",
+    "husky": "9.1.7",
     "is-ci": "3.0.1",
     "jest": "29.7.0",
     "jest-canvas-mock": "2.5.2",
@@ -63,24 +65,25 @@
     "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.10",
+    "maplibre-gl": "4.7.1",
     "mock-socket": "9.3.1",
-    "next": "14.1.0",
+    "next": "15.0.3",
     "next-transpile-modules": "10.0.1",
-    "ol": "9.0.0",
-    "openapi-typescript": "6.7.4",
-    "prettier": "3.2.5",
+    "ol": "10.3.1",
+    "openapi-typescript": "6.7.5",
+    "prettier": "3.4.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",
-    "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"
+    "start-server-and-test": "2.0.8",
+    "stylelint": "16.11.0",
+    "stylelint-config-recommended-scss": "14.1.0",
+    "stylelint-config-standard": "36.0.1",
+    "stylelint-scss": "6.10.0",
+    "ts-jest": "^29.2.5",
+    "typescript": "5.7.2",
+    "vite": "^6.0.2"
   },
   "scripts": {
     "apidoc": "esdoc && cp apidoc/index.json doc/src/components/Esdoc",
@@ -93,21 +96,18 @@
     "cy:test:chrome": "yarn build && start-server-and-test start http://localhost:3000 'cypress run --browser chrome'",
     "cy:test:edge": "yarn build && start-server-and-test start http://localhost:3000 'cypress run --browser edge'",
     "cy:test:firefox": "yarn build && start-server-and-test start http://localhost:3000 'cypress run --browser firefox'",
-    "dev": "yarn clean && yarn build && yarn apidoc && yarn dev:examples",
-    "dev:examples": "yarn clean && yarn build && cd doc && rm -rf node_modules/mobility-toolbox-js && yarn install --force && yarn dev",
+    "dev": "vite",
     "doc": "yarn build && yarn apidoc && cd doc && rm -rf node_modules/mobility-toolbox-js && yarn install --force && yarn build",
+    "doc:dev": "yarn clean && yarn build && yarn apidoc && yarn doc:dev:examples",
+    "doc:dev:examples": "yarn clean && yarn build && cd doc && rm -rf node_modules/mobility-toolbox-js && yarn install --force && yarn dev",
     "esbuild": "yarn esbuild:all && yarn esbuild:iife",
     "esbuild:all": "esbuild src/index.js src/**/*.js src/**/*.ts src/**/**/*.js src/**/**/*.ts --target=chrome100 --outdir=build/ --loader:.js=jsx",
     "esbuild:iife": "yarn esbuild:iife:unminify && yarn esbuild:iife:minify",
     "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",
-    "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",
+    "format": "prettier --write 'src/**/*.js' 'src/**/*.test.js' && eslint src/**/*.js src/**/*.test.js src/**/*.ts --fix && stylelint 'src/**/*.css' 'src/**/*.scss' --fix --allow-empty-input",
     "lint": "eslint src/**/*.js src/**/*.ts && stylelint src/**/*.css src/**/*.scss --allow-empty-input",
-    "prepare": "is-ci || husky",
     "publish:beta": "HUSKY=0 yarn release -- --prerelease beta --skip.changelog  && yarn run build && cd build && HUSKY=0 yarn publish --tag beta && git push origin HEAD && git push --tags ",
     "publish:beta:dryrun": "yarn release -- --prerelease beta --dry-run --skip.changelog",
     "publish:public": "yarn release  && yarn run build && cd build && HUSKY=0 yarn publish && git push origin HEAD && git push --tags ",

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;
@@ -24,3 +23,17 @@ class ResizeObserver {
     disconnect() { }
 }
 window.ResizeObserver = ResizeObserver;
+window.noop = () => { };
+class Worker {
+    constructor(stringUrl) {
+        this.url = stringUrl;
+        this.onmessage = noop;
+    }
+    postMessage(msg) {
+        this.onmessage(msg);
+    }
+}
+Object.defineProperty(window, 'Worker', {
+    writable: true,
+    value: Worker,
+});