mobility-toolbox-js 3.0.0-beta.35 → 3.0.0-beta.37

package/ol/controls/RoutingControl.d.ts

@@ -27,7 +27,7 @@ export type RoutingControlOptions = {
     style?: StyleLike;
     useRawViaPoints?: boolean;
 } & Options;
-export type AbotControllersByGraph = Record<string, AbortController>;
+export type AbortControllersByGraph = Record<string, AbortController>;
 /**
  * This OpenLayers control allows the user to add and modifiy via points to
  * a map and request a route from the [geOps Routing API](https://developer.geops.io/apis/routing/).

package/ol/controls/RoutingControl.js

@@ -250,7 +250,7 @@ class RoutingControl extends Control {
          */
         // Define and add modify interaction
         this.modifyInteraction = new Modify({
-            // hitDetection: this.routingLayer, // Create a bug, the first point is always selected even if the mous eis far away
+            // hitDetection: this.routingLayer, // TODO: wait for ol, fixed in https://github.com/openlayers/openlayers/pull/16393
             deleteCondition: (e) => {
                 var _a;
                 const feats = ((_a = e.target) === null || _a === void 0 ? void 0 : _a.getFeaturesAtPixel(e.pixel, {
@@ -294,7 +294,7 @@ class RoutingControl extends Control {
         var _a, _b;
         /* Calls RoutingAPI to draw a route using the viaPoints array */
         this.abortRequests();
-        (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.clear(true);
+        (_b = (_a = this.routingLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.clear();
         if (!this.viaPoints.length) {
             return null;
         }

package/ol/layers/MaplibreLayer.d.ts

@@ -1,9 +1,8 @@
 import { MapLibreLayer } from '@geoblocks/ol-maplibre-layer';
 import OlMap from 'ol/Map';
 import { MobilityLayerOptions } from '../mixins/MobilityLayerMixin';
-import type { MapLibreOptions } from '@geoblocks/ol-maplibre-layer/lib/types/MapLibreLayer';
+import type { MapLibreLayerOptions, MapLibreOptions } from '@geoblocks/ol-maplibre-layer/lib/types/MapLibreLayer';
 import type { QueryRenderedFeaturesOptions } from 'maplibre-gl';
-import type { Options as LayerOptions } from 'ol/layer/Layer';
 export type MaplibreLayerOptions = {
     apiKey?: string;
     apiKeyName?: string;
@@ -11,7 +10,7 @@ export type MaplibreLayerOptions = {
     queryRenderedFeaturesOptions?: QueryRenderedFeaturesOptions | undefined;
     style?: maplibregl.StyleSpecification | null | string;
     url?: string;
-} & LayerOptions & MobilityLayerOptions;
+} & MapLibreLayerOptions & MobilityLayerOptions;
 declare const MaplibreLayer_base: {
     new (...args: any[]): {
         olEventsKeys: import("ol/events").EventsKey[];
@@ -19,9 +18,9 @@ declare const MaplibreLayer_base: {
         attachToMap(map: OlMap): void;
         detachFromMap(): void;
         flat(): any[];
-        onChildrenChange(oldValue: import("ol/layer/Layer").default[]): void;
+        onChildrenChange(oldValue: import("ol/layer").Layer[]): void;
         setMapInternal: ((map: OlMap) => void) & ((map: import("ol/Map").default | null) => void);
-        children: import("ol/layer/Layer").default<import("ol/source").Source, import("ol/renderer/Layer").default<any>>[];
+        children: import("ol/layer").Layer<import("ol/source").Source, import("ol/renderer/Layer").default<any>>[];
         get copyrights(): string;
         set copyrights(newCopyrights: string | string[]);
         disabled: boolean;
@@ -30,8 +29,8 @@ declare const MaplibreLayer_base: {
         readonly key: string;
         readonly map: OlMap;
         readonly name: string;
-        olLayer: import("ol/layer/Layer").default;
-        parent: import("ol/layer/Layer").default<import("ol/source").Source, import("ol/renderer/Layer").default<any>>;
+        olLayer: import("ol/layer").Layer;
+        parent: import("ol/layer").Layer<import("ol/source").Source, import("ol/renderer/Layer").default<any>>;
         visible: boolean;
         on: import("ol/layer/Layer").LayerOnSignature<import("ol/events").EventsKey>;
         once: import("ol/layer/Layer").LayerOnSignature<import("ol/events").EventsKey>;
@@ -55,7 +54,7 @@ declare const MaplibreLayer_base: {
         getBackground: () => import("ol/layer/Base").BackgroundColor | false;
         getClassName: () => string;
         getLayerState: (managed?: boolean | undefined) => import("ol/layer/Layer").State;
-        getLayersArray: (array?: import("ol/layer/Layer").default<import("ol/source").default, import("ol/renderer/Layer").default<any>>[] | undefined) => Array<import("ol/layer/Layer").default>;
+        getLayersArray: (array?: import("ol/layer").default<import("ol/source").default, import("ol/renderer/Layer").default<any>>[] | undefined) => Array<import("ol/layer").default>;
         getLayerStatesArray: (states?: import("ol/layer/Layer").State[] | undefined) => Array<import("ol/layer/Layer").State>;
         getExtent: () => import("ol/extent").Extent | undefined;
         getMaxResolution: () => number;
@@ -158,7 +157,7 @@ declare class MaplibreLayer extends MaplibreLayer_base {
      * @public
      */
     clone(newOptions: MaplibreLayerOptions): MaplibreLayer;
-    getStyle(): string;
+    getStyle(): any;
     updateMaplibreMap(): void;
     set apiKey(newValue: string);
     get apiKey(): string;

package/ol/layers/MaplibreLayer.js

@@ -71,6 +71,9 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
             newOptions.mapLibreOptions.style = buildStyleUrl(newOptions.url, newOptions.style, newOptions.apiKey, newOptions.apiKeyName);
         }
         super(newOptions);
+        // We save the options to be able to clone the layer.
+        // and to see if the style is defined by the maplibreOptions given by the user.
+        this.set('options', options);
     }
     /**
      * Initialize the layer and listen to feature clicks.
@@ -105,6 +108,7 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
         return new MaplibreLayer(Object.assign(Object.assign({}, (this.options || {})), (newOptions || {})));
     }
     getStyle() {
+        var _a, _b;
         // If the style is a complete style object, use it directly.
         if (this.style &&
             typeof this.style === 'object' &&
@@ -116,6 +120,10 @@ class MaplibreLayer extends MobilityLayerMixin(MapLibreLayer) {
         if (this.url.includes('style.json')) {
             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;
+        }
         /// Otherwise build the complete style url.
         return buildStyleUrl(this.url, this.style, this.apiKey, this.apiKeyName);
     }

package/ol/mixins/PropertiesLayerMixin.d.ts

@@ -84,7 +84,7 @@ declare function PropertiesLayerMixin<TBase extends Layerable>(Base: TBase): {
         getBackground: () => import("ol/layer/Base").BackgroundColor | false;
         getClassName: () => string;
         getLayerState: (managed?: boolean | undefined) => import("ol/layer/Layer").State;
-        getLayersArray: (array?: import("ol/layer/Layer").default<import("ol/source").default, import("ol/renderer/Layer").default<any>>[] | undefined) => Array<import("ol/layer/Layer" /** @deprecated */).default>;
+        getLayersArray: (array?: import("ol/layer/Layer").default<import("ol/source").default, import("ol/renderer/Layer").default<any>>[] | undefined) => Array<import("ol/layer/Layer").default>;
         getLayerStatesArray: (states?: import("ol/layer/Layer").State[] | undefined) => Array<import("ol/layer/Layer").State>;
         getExtent: () => import("ol/extent").Extent | undefined;
         getMaxResolution: () => number;

package/ol/mixins/PropertiesLayerMixin.js

@@ -1,6 +1,5 @@
 // eslint-disable-next-line max-classes-per-file
 import debounce from 'lodash.debounce';
-import { getUid } from 'ol';
 import { unByKey } from 'ol/Observable';
 import getLayersAsFlatArray from '../../common/utils/getLayersAsFlatArray';
 let deprecated = () => { };
@@ -134,7 +133,7 @@ function PropertiesLayerMixin(Base) {
             this.set('hitTolerance', newValue);
         }
         get key() {
-            return this.get('key') || this.get('name') || getUid(this);
+            return this.get('key') || this.get('name');
         }
         get map() {
             return this.getMapInternal();

package/ol/styles/routingStyle.js

@@ -32,16 +32,24 @@ const dashedRedLine = new Style({
     }),
 });
 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/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.0.0-beta.35",
+  "version": "3.0.0-beta.37",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "exports": {
     ".": "./index.js",
@@ -26,8 +26,8 @@
   "devDependencies": {
     "@babel/preset-env": "^7.26.0",
     "@babel/preset-typescript": "^7.26.0",
-    "@commitlint/cli": "19.5.0",
-    "@commitlint/config-conventional": "19.5.0",
+    "@commitlint/cli": "19.6.0",
+    "@commitlint/config-conventional": "19.6.0",
     "@geops/eslint-config-react": "^1.2.0",
     "@types/geojson": "7946.0.14",
     "@types/lodash": "^4.17.13",
@@ -37,9 +37,9 @@
     "@types/offscreencanvas": "2019.7.3",
     "@types/topojson": "3.2.6",
     "@types/uuid": "10.0.0",
-    "@typescript-eslint/eslint-plugin": "8.14.0",
-    "@typescript-eslint/parser": "8.14.0",
-    "cypress": "13.15.2",
+    "@typescript-eslint/eslint-plugin": "8.15.0",
+    "@typescript-eslint/parser": "8.15.0",
+    "cypress": "13.16.0",
     "esbuild": "0.24.0",
     "esdoc": "1.1.0",
     "esdoc-ecmascript-proposal-plugin": "1.0.0",
@@ -56,7 +56,7 @@
     "eslint-plugin-prettier": "5.2.1",
     "eslint-plugin-react": "7.37.2",
     "fixpack": "4.0.0",
-    "husky": "9.1.6",
+    "husky": "9.1.7",
     "is-ci": "3.0.1",
     "jest": "29.7.0",
     "jest-canvas-mock": "2.5.2",
@@ -80,9 +80,10 @@
     "stylelint": "16.10.0",
     "stylelint-config-recommended-scss": "14.1.0",
     "stylelint-config-standard": "36.0.1",
-    "stylelint-scss": "6.9.0",
+    "stylelint-scss": "6.10.0",
     "ts-jest": "^29.2.5",
-    "typescript": "5.6.3"
+    "typescript": "5.6.3",
+    "vite": "^5.4.11"
   },
   "scripts": {
     "apidoc": "esdoc && cp apidoc/index.json doc/src/components/Esdoc",
@@ -95,9 +96,10 @@
     "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 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",
@@ -105,9 +107,6 @@
     "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' 'src/**/*.test.js' && eslint src/**/*.js src/**/*.test.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",
     "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 ",