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

package/ol/controls/RoutingControl.d.ts

@@ -1,3 +1,6 @@
+import type { Map, MapBrowserEvent } from 'ol';
+import type { Coordinate } from 'ol/coordinate';
+import type { StyleLike } from 'ol/style/Style';
 import { Feature } from 'ol';
 import Control, { Options } from 'ol/control/Control';
 import { EventsKey } from 'ol/events';
@@ -7,11 +10,9 @@ import { Modify } from 'ol/interaction';
 import { ModifyEvent } from 'ol/interaction/Modify';
 import VectorLayer from 'ol/layer/Vector';
 import VectorSource from 'ol/source/Vector';
-import { RoutingAPI } from '../../api';
-import type { Map, MapBrowserEvent } from 'ol';
-import type { Coordinate } from 'ol/coordinate';
-import type { StyleLike } from 'ol/style/Style';
 import type { RoutingGraph, RoutingMot, RoutingParameters, RoutingViaPoint } from '../../types';
+import { RoutingAPI } from '../../api';
+export type AbortControllersByGraph = Record<string, AbortController>;
 export type RoutingControlOptions = {
     active?: boolean;
     apiKey?: string;
@@ -27,7 +28,6 @@ export type RoutingControlOptions = {
     style?: StyleLike;
     useRawViaPoints?: boolean;
 } & Options;
-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/).
@@ -79,6 +79,14 @@ declare class RoutingControl extends Control {
     stopsApiUrl?: string;
     useRawViaPoints: boolean;
     viaPoints: RoutingViaPoint[];
+    get active(): boolean;
+    set active(newValue: boolean);
+    get loading(): boolean;
+    set loading(newValue: boolean);
+    get modify(): any;
+    set modify(newValue: any);
+    get mot(): RoutingMot;
+    set mot(newValue: RoutingMot);
     /**
      * Constructor.
      *
@@ -201,13 +209,5 @@ declare class RoutingControl extends Control {
      * @public
      */
     setViaPoints(coordinateArray: Coordinate[]): void;
-    get active(): boolean;
-    set active(newValue: boolean);
-    get loading(): boolean;
-    set loading(newValue: boolean);
-    get modify(): any;
-    set modify(newValue: any);
-    get mot(): RoutingMot;
-    set mot(newValue: RoutingMot);
 }
 export default RoutingControl;

package/ol/controls/RoutingControl.js

@@ -68,6 +68,30 @@ const getFlatCoordinatesFromSegments = (segmentArray) => {
  * @public
  */
 class RoutingControl extends Control {
+    get active() {
+        return this.get('active');
+    }
+    set active(newValue) {
+        this.set('active', newValue);
+    }
+    get loading() {
+        return this.get('loading');
+    }
+    set loading(newValue) {
+        this.set('loading', newValue);
+    }
+    get modify() {
+        return this.get('modify');
+    }
+    set modify(newValue) {
+        this.set('modify', newValue);
+    }
+    get mot() {
+        return this.get('mot');
+    }
+    set mot(newValue) {
+        this.set('mot', newValue);
+    }
     /**
      * Constructor.
      *
@@ -122,7 +146,6 @@ class RoutingControl extends Control {
                 ((error) => {
                     this.dispatchEvent(new BaseEvent('change:route'));
                     this.reset();
-                    // eslint-disable-next-line no-console
                     console.error(error);
                 });
         this.onMapClick = this.onMapClick.bind(this);
@@ -147,10 +170,12 @@ class RoutingControl extends Control {
      */
     static getGraphsResolutions(graphs, map) {
         const view = map.getView();
-        return graphs.map(([, minZoom, maxZoom]) => [
-            view.getResolutionForZoom(minZoom),
-            view.getResolutionForZoom(maxZoom || minZoom + 1),
-        ]);
+        return graphs.map(([, minZoom, maxZoom]) => {
+            return [
+                view.getResolutionForZoom(minZoom),
+                view.getResolutionForZoom(maxZoom || minZoom + 1),
+            ];
+        });
     }
     /**
      * Aborts viapoint and route requests
@@ -231,7 +256,9 @@ class RoutingControl extends Control {
         this.element = document.createElement('button');
         this.element.id = 'ol-toggle-routing';
         this.element.innerHTML = 'Toggle Route Control';
-        this.element.onclick = () => this.active ? this.deactivate() : this.activate();
+        this.element.onclick = () => {
+            return this.active ? this.deactivate() : this.activate();
+        };
         Object.assign(this.element.style, {
             position: 'absolute',
             right: '10px',
@@ -256,7 +283,10 @@ class RoutingControl extends Control {
                 const feats = ((_a = e.target) === null || _a === void 0 ? void 0 : _a.getFeaturesAtPixel(e.pixel, {
                     hitTolerance: 5,
                 })) || [];
-                const viaPoint = feats.find((feat) => { var _a; return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'Point' && feat.get('index'); });
+                const viaPoint = feats.find((feat) => {
+                    var _a;
+                    return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'Point' && feat.get('index');
+                });
                 if (click(e) && viaPoint) {
                     // Remove node & viaPoint if an existing viaPoint was clicked
                     this.removeViaPoint(viaPoint.get('index'));
@@ -325,9 +355,7 @@ class RoutingControl extends Control {
                 return Promise.resolve([]);
             }
             return this.api
-                .route(Object.assign({ 'coord-punish': 1000.0, 'coord-radius': 100.0, 
-                // @ts-expect-error  missing property in swagger
-                elevation: false, graph, mot: this.mot, 'resolve-hops': false, via: `${formattedViaPoints.join('|')}` }, (this.apiParams || {})), { signal })
+                .route(Object.assign({ 'coord-punish': 1000.0, 'coord-radius': 100.0, elevation: false, graph, mot: this.mot, 'resolve-hops': false, via: `${formattedViaPoints.join('|')}` }, (this.apiParams || {})), { signal })
                 .then((featureCollection) => {
                 var _a, _b, _c;
                 this.segments = this.format.readFeatures(featureCollection);
@@ -335,7 +363,9 @@ class RoutingControl extends Control {
                     // Extract unique values from viaPoint target value
                     const uniqueVias = this.segments.reduce((resultVias, currentFeat) => {
                         const segTrg = currentFeat.get('trg');
-                        return resultVias.find((via) => via[0] === segTrg[0] && via[1] === segTrg[1])
+                        return resultVias.find((via) => {
+                            return via[0] === segTrg[0] && via[1] === segTrg[1];
+                        })
                             ? resultVias
                             : [...resultVias, segTrg];
                     }, []);
@@ -409,7 +439,9 @@ class RoutingControl extends Control {
                 [stationId, track] = viaPoint.split('$');
             }
             return fetch(`${this.stopsApiUrl}lookup/${stationId}?key=${this.stopsApiKey}`, { signal: abortController.signal })
-                .then((res) => res.json())
+                .then((res) => {
+                return res.json();
+            })
                 .then((stationData) => {
                 var _a, _b, _c, _d;
                 const { coordinates } = ((_b = (_a = stationData === null || stationData === void 0 ? void 0 : stationData.features) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.geometry) || {};
@@ -468,7 +500,9 @@ class RoutingControl extends Control {
         }
         if (stationName) {
             return fetch(`${this.stopsApiUrl}?key=${this.stopsApiKey}&q=${stationName}&limit=1`, { signal: abortController.signal })
-                .then((res) => res.json())
+                .then((res) => {
+                return res.json();
+            })
                 .then((stationData) => {
                 var _a, _b;
                 const { coordinates } = stationData.features[0].geometry;
@@ -510,12 +544,14 @@ class RoutingControl extends Control {
     onMapClick(evt) {
         const feats = evt.target.getFeaturesAtPixel(evt.pixel, {
             hitTolerance: 5,
-            layerFilter: (layer) => layer === this.routingLayer,
+            layerFilter: (layer) => {
+                return layer === this.routingLayer;
+            },
         });
         const viaPoint = feats.find((feat) => {
             var _a;
-            return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'Point' &&
-                feat.get('viaPointIdx') !== undefined;
+            return (((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'Point' &&
+                feat.get('viaPointIdx') !== undefined);
         });
         if (viaPoint) {
             // Remove existing viaPoint on click and abort viaPoint add
@@ -557,22 +593,26 @@ class RoutingControl extends Control {
         var _a;
         // When modify start, we search the index of the segment that is modifying.
         let segmentIndex = -1;
-        const route = evt.features
-            .getArray()
-            .find((feat) => { var _a; return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'LineString'; });
+        const route = evt.features.getArray().find((feat) => {
+            var _a;
+            return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'LineString';
+        });
         // Find the segment index that is being modified
         if ((route === null || route === void 0 ? void 0 : route.getGeometry()) && evt.mapBrowserEvent.coordinate) {
             // We use a buff extent to fix floating issues , see https://github.com/openlayers/openlayers/issues/7130#issuecomment-535856422
             const closestExtent = buffer(new Point(
             // @ts-expect-error bad def
             (_a = route.getGeometry()) === null || _a === void 0 ? void 0 : _a.getClosestPoint(evt.mapBrowserEvent.coordinate)).getExtent(), 0.001);
-            segmentIndex = this.segments.findIndex((segment) => { var _a; return (_a = segment.getGeometry()) === null || _a === void 0 ? void 0 : _a.intersectsExtent(closestExtent); });
+            segmentIndex = this.segments.findIndex((segment) => {
+                var _a;
+                return (_a = segment.getGeometry()) === null || _a === void 0 ? void 0 : _a.intersectsExtent(closestExtent);
+            });
         }
         // Find the viaPoint that is being modified
-        const viaPoint = (evt.features
-            .getArray()
-            .filter((feat) => { var _a; return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'Point'; }) ||
-            [])[0];
+        const viaPoint = (evt.features.getArray().filter((feat) => {
+            var _a;
+            return ((_a = feat.getGeometry()) === null || _a === void 0 ? void 0 : _a.getType()) === 'Point';
+        }) || [])[0];
         // Write object with modify info
         this.initialRouteDrag = {
             oldRoute: route === null || route === void 0 ? void 0 : route.clone(),
@@ -635,29 +675,5 @@ class RoutingControl extends Control {
         this.drawRoute();
         this.dispatchEvent(new BaseEvent('change:route'));
     }
-    get active() {
-        return this.get('active');
-    }
-    set active(newValue) {
-        this.set('active', newValue);
-    }
-    get loading() {
-        return this.get('loading');
-    }
-    set loading(newValue) {
-        this.set('loading', newValue);
-    }
-    get modify() {
-        return this.get('modify');
-    }
-    set modify(newValue) {
-        this.set('modify', newValue);
-    }
-    get mot() {
-        return this.get('mot');
-    }
-    set mot(newValue) {
-        this.set('mot', newValue);
-    }
 }
 export default RoutingControl;

package/ol/layers/RealtimeLayer.js

@@ -269,15 +269,8 @@ class RealtimeLayer extends Layer {
     highlightTrajectory(id) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d, _e, _f;
-            if (!id) {
-                this.cleanVectorLayer();
-                return;
-            }
             const features = yield this.getFullTrajectory(id);
-            if (!(features === null || features === void 0 ? void 0 : features.length)) {
-                this.cleanVectorLayer();
-                return;
-            }
+            this.cleanVectorLayer();
             if (features.length) {
                 (_b = (_a = this.vectorLayer) === null || _a === void 0 ? void 0 : _a.getSource()) === null || _b === void 0 ? void 0 : _b.addFeatures(features);
             }
@@ -334,6 +327,7 @@ class RealtimeLayer extends Layer {
     select(feature) {
         const id = feature === null || feature === void 0 ? void 0 : feature.get('train_id');
         if (this.selectedVehicleId !== id) {
+            this.cleanVectorLayer();
             this.selectedVehicleId = id;
             this.engine.renderTrajectories(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.2.0-beta.0",
+  "version": "3.2.1",
   "homepage": "https://mobility-toolbox-js.geops.io/",
   "exports": {
     ".": "./index.js",
@@ -63,7 +63,7 @@
     "next": "15.1.6",
     "next-transpile-modules": "10.0.1",
     "ol": "10.4.0",
-    "openapi-typescript": "6.7.5",
+    "openapi-typescript": "5",
     "prettier": "3.4.2",
     "raw-loader": "4.0.2",
     "sort-json": "2.0.1",

package/types/routing.d.ts

@@ -3,64 +3,12 @@
  * Do not make direct changes to the file.
  */
 
-export interface Paths {
+export interface paths {
   '/': {
     /** Returns a route as GeoJSON */
     get: {
       parameters: {
         query: {
-          /**
-           * Whether to use beelines (line strings with 2 points) between
-           * mutually unreachable hops as a fallback for "Route not found"
-           * errors. "true", "on", "yes", "y", "1" will enable the
-           * fallback. Default: enabled
-           */
-          'beeline-fallback'?: string;
-          /**
-           * Distance punishment factor for edge snapping of coordinates (see
-           * "Note on coordinates" at the top). Large: prefer close edge. Small:
-           * prefer short total route. Negative value: like worst edge
-           * category. Default: -1.0
-           */
-          'coord-punish'?: number;
-          /**
-           * Search radius for candidate edges during snapping of coordinates
-           * (see "Note on coordinates" at the top) Default: -1.0
-           */
-          'coord-radius'?: number;
-          /** Only for mot=rail. Default is a detailed network based on OpenStreetMap. gen1 to gen4 provide rail networks with increasing levels of generalization */
-          graph?: 'gen1' | 'gen2' | 'gen3' | 'gen4';
-          /**
-           * Whether to include intermediate hops (stations/stops) found on the
-           * route to the response. "true", "on", "yes", "y", "1" will enable
-           * intermediate hops. Default: disabled
-           */
-          hops?: string;
-          /** A line name that should be preferred */
-          line?: string;
-          /** Name of origin of the preferred line */
-          'line-from'?: string;
-          /** Name of destination of the preferred line */
-          'line-to'?: string;
-          /**
-           * Maximum allowed ratio of hops to skip if not found. Only non-start
-           * and non-end hops are counted in ratio numerator and denominator.
-           */
-          'max-skip-hop-ratio'?: number;
-          /** Mode of transport */
-          mot:
-            | 'bus'
-            | 'car'
-            | 'coach'
-            | 'ferry'
-            | 'foot'
-            | 'funicular'
-            | 'gondola'
-            | 'rail'
-            | 'subway'
-            | 'tram';
-          /** Douglas-Peucker distance parameter for simplification. Default 0.5 in Mercator units */
-          simplify?: number;
           /**
            * A pipe separated list of hops. A hop describes a station with either
            *  - a name or abbreviation
@@ -104,6 +52,58 @@ export interface Paths {
            *  - `freiburg|basel%20sbb|bern` - from Freiburg (Breisgau) Hbf via Basel SBB to Bern
            */
           via: string;
+          /** Mode of transport */
+          mot:
+            | 'rail'
+            | 'bus'
+            | 'coach'
+            | 'foot'
+            | 'tram'
+            | 'subway'
+            | 'gondola'
+            | 'funicular'
+            | 'ferry'
+            | 'car';
+          /** Only for mot=rail. Default is a detailed network based on OpenStreetMap. gen1 to gen4 provide rail networks with increasing levels of generalization */
+          graph?: 'gen1' | 'gen2' | 'gen3' | 'gen4';
+          /** A line name that should be preferred */
+          line?: string;
+          /** Name of origin of the preferred line */
+          'line-from'?: string;
+          /** Name of destination of the preferred line */
+          'line-to'?: string;
+          /** Douglas-Peucker distance parameter for simplification. Default 0.5 in Mercator units */
+          simplify?: number;
+          /**
+           * Maximum allowed ratio of hops to skip if not found. Only non-start
+           * and non-end hops are counted in ratio numerator and denominator.
+           */
+          'max-skip-hop-ratio'?: number;
+          /**
+           * Whether to include intermediate hops (stations/stops) found on the
+           * route to the response. "true", "on", "yes", "y", "1" will enable
+           * intermediate hops. Default: disabled
+           */
+          hops?: string;
+          /**
+           * Whether to use beelines (line strings with 2 points) between
+           * mutually unreachable hops as a fallback for "Route not found"
+           * errors. "true", "on", "yes", "y", "1" will enable the
+           * fallback. Default: enabled
+           */
+          'beeline-fallback'?: string;
+          /**
+           * Search radius for candidate edges during snapping of coordinates
+           * (see "Note on coordinates" at the top) Default: -1.0
+           */
+          'coord-radius'?: number;
+          /**
+           * Distance punishment factor for edge snapping of coordinates (see
+           * "Note on coordinates" at the top). Large: prefer close edge. Small:
+           * prefer short total route. Negative value: like worst edge
+           * category. Default: -1.0
+           */
+          'coord-punish'?: number;
           /**
            * Whether to output OSM way ids in Feature properties.
            * "true", "on", "yes", "y", "1" will enable output. Default: disabled
@@ -147,14 +147,14 @@ export interface Paths {
                  * @example
                  */
                 id?: string;
-                /** @description Latitude of the stop, in WGS84 */
-                latitude?: number;
-                /** @description Latitude of the stop, in WGS84 */
-                longitude?: number;
                 /** @example Freiburg Littenweiler */
                 name?: string;
                 /** @example 1 */
                 platform?: string;
+                /** @description Latitude of the stop, in WGS84 */
+                latitude?: number;
+                /** @description Latitude of the stop, in WGS84 */
+                longitude?: number;
               };
               station_to?: {
                 /**
@@ -162,14 +162,14 @@ export interface Paths {
                  * @example 8004158
                  */
                 id?: string;
-                /** @description Latitude of the stop, in WGS84 */
-                latitude?: number;
-                /** @description Latitude of the stop, in WGS84 */
-                longitude?: number;
                 /** @example Muenchen Pasing */
                 name?: string;
                 /** @example 4 */
                 platform?: string;
+                /** @description Latitude of the stop, in WGS84 */
+                latitude?: number;
+                /** @description Latitude of the stop, in WGS84 */
+                longitude?: number;
               };
               /** @enum {string} */
               type?: 'Feature';
@@ -201,6 +201,6 @@ export interface Paths {
   };
 }
 
-export interface Operations {}
+export interface operations {}
 
-export interface External {}
+export interface external {}

package/types/stops.d.ts

@@ -3,41 +3,41 @@
  * Do not make direct changes to the file.
  */
 
-export interface Paths {
+export interface paths {
   '/': {
     /** Returns a stop (or multiple) as GeoJSON FeatureCollection */
     get: {
       parameters: {
         query: {
-          /**
-           * left,bottom,right,up coordinates in WGS84 wherein the
-           * station should lie
-           */
-          bbox?: string;
-          /** which field to look up, default: all of them */
-          field?: 'coords' | 'id' | 'name';
           /** Control how many matches will be returned */
           limit?: number;
+          /** Anything you'd like to search for */
+          q: string;
+          /**
+           * comma seperated list, order chooses which agency will be preferred
+           * as ident_source (for id and code fields)
+           */
+          prefagencies?: 'sbb' | 'db';
           /**
            * comma seperated list of mot's which should be available
            * at the stop
            */
           mots?:
             | 'bus'
-            | 'cable_car'
             | 'ferry'
-            | 'funicular'
             | 'gondola'
+            | 'tram'
             | 'rail'
-            | 'subway'
-            | 'tram';
+            | 'funicular'
+            | 'cable_car'
+            | 'subway';
           /**
-           * comma seperated list, order chooses which agency will be preferred
-           * as ident_source (for id and code fields)
+           * left,bottom,right,up coordinates in WGS84 wherein the
+           * station should lie
            */
-          prefagencies?: 'db' | 'sbb';
-          /** Anything you'd like to search for */
-          q: string;
+          bbox?: string;
+          /** which field to look up, default: all of them */
+          field?: 'id' | 'name' | 'coords';
           /**
            * Coordinates in WGS84 (in lat,lon order) used to rank stops close to
            * this position higher
@@ -49,81 +49,81 @@ export interface Paths {
         /** stop(s) */
         200: {
           schema: {
+            /** @enum {string} */
+            type?: 'FeatureCollection';
             features?: {
-              /** @description the coordinates of the stop */
-              geometry?: {
-                /**
-                 * @example [
-                 *   7.439119,
-                 *   46.94882
-                 * ]
-                 */
-                coordinates?: number[];
-                /** @enum {string} */
-                type?: 'Point';
-              };
+              /** @enum {string} */
+              type?: 'Feature';
               properties?: {
+                /** @description internal ID */
+                uid?: string;
                 /**
-                 * @description Abbreviation code from the transport agency (e.g. DS100 for Deutsche Bahn)
-                 *
-                 * @example BN
+                 * @description name of the stop
+                 * @example Bern
                  */
-                code?: string;
+                name?: string;
                 /**
                  * @description 2 letter country code where the station is located
                  * @example CH
                  */
                 country_code?: string;
                 /**
-                 * @description uic number
-                 * @example 8507000
+                 * @description how well the result matches your query, 0
+                 * means best
                  */
-                id?: string;
+                rank?: number;
                 /**
-                 * @description source agency for id and code (see below)
-                 * @example sbb
+                 * @description array of translations of the stopname
+                 * @default []
                  */
-                ident_source?: string;
-                /** @description ifopt identifier, if available */
-                ifopt?: string;
+                translated_names?: {
+                  value?: string;
+                  /** @enum {string} */
+                  language?: 'de' | 'en' | 'fr' | 'it';
+                }[];
                 /** @description Means of transport that are available at this station */
                 mot?: {
                   bus?: boolean;
-                  cable_car?: boolean;
                   ferry?: boolean;
-                  funicular?: boolean;
                   gondola?: boolean;
+                  tram?: boolean;
                   rail?: boolean;
+                  funicular?: boolean;
+                  cable_car?: boolean;
                   subway?: boolean;
-                  tram?: boolean;
                 };
                 /**
-                 * @description name of the stop
-                 * @example Bern
+                 * @description source agency for id and code (see below)
+                 * @example sbb
                  */
-                name?: string;
+                ident_source?: string;
                 /**
-                 * @description how well the result matches your query, 0
-                 * means best
+                 * @description uic number
+                 * @example 8507000
                  */
-                rank?: number;
+                id?: string;
                 /**
-                 * @description array of translations of the stopname
-                 * @default []
+                 * @description Abbreviation code from the transport agency (e.g. DS100 for Deutsche Bahn)
+                 *
+                 * @example BN
                  */
-                translated_names?: {
-                  /** @enum {string} */
-                  language?: 'de' | 'en' | 'fr' | 'it';
-                  value?: string;
-                }[];
-                /** @description internal ID */
-                uid?: string;
+                code?: string;
+                /** @description ifopt identifier, if available */
+                ifopt?: string;
+              };
+              /** @description the coordinates of the stop */
+              geometry?: {
+                /** @enum {string} */
+                type?: 'Point';
+                /**
+                 * @example [
+                 *   7.439119,
+                 *   46.94882
+                 * ]
+                 */
+                coordinates?: number[];
               };
-              /** @enum {string} */
-              type?: 'Feature';
             }[];
-            /** @enum {string} */
-            type?: 'FeatureCollection';
           };
         };
         /** limit parameter too high */
@@ -138,6 +138,6 @@ export interface Paths {
   };
 }
 
-export interface Operations {}
+export interface operations {}
 
-export interface External {}
+export interface external {}