mobility-toolbox-js 2.0.0-beta.67 → 2.0.0-beta.69

package/ol/layers/RealtimeLayer.d.ts

@@ -65,7 +65,6 @@ declare const RealtimeLayer_base: {
         renderTrajectoriesInternal(viewState: import("../../types").ViewState, noInterpolate?: boolean): boolean;
         renderTrajectories(viewState: import("../../types").ViewState | undefined, noInterpolate: boolean | undefined): void;
         setBbox(extent?: [number, number, number, number] | undefined, zoom?: number | undefined): void;
-        setMode(mode: import("../../types").RealtimeMode): void;
         getRefreshTimeInMs(zoom?: number | undefined): number;
         getVehicle(filterFc: Function): GeoJSONFeature[];
         getFeatureInfoAtCoordinate(coordinate: Coordinate, options: import("../../types").LayerGetFeatureInfoOptions): Promise<{

package/ol/layers/RealtimeLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RealtimeLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/RealtimeLayer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAKxC,OAAO,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAc,EACZ,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,MAAM,EACN,2BAA2B,EAC3B,sBAAsB,EACtB,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAK7E,oBAAY,sBAAsB,GAAG,yBAAyB,GAAG;IAC/D,mBAAmB,EAAE,CACnB,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,GAAG,KACT,IAAI,CAAC;IACV,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF;;;;;;;;;;;;;;;;;GAiBG;AAEH,cAAM,aAAc,SAAQ,kBAAY;IACtC,wBAAwB,CAAC,EAAE,OAAO,CAAS;IAE3C;;;;;OAKG;gBACS,OAAO,EAAE,sBAAsB;IAmG3C,WAAW,CAAC,GAAG,EAAE,MAAM;IA4BvB;;OAEG;IACH,aAAa;IAKb;;;;OAIG;IACH,0BAA0B,CAAC,UAAU,EAAE,UAAU;IAcjD;;;;OAIG;IAEH,kBAAkB,CAAC,aAAa,EAAE,OAAO;IAoBzC;;;;OAIG;IACH,0BAA0B,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO;IA2BvE;;OAEG;IACH,kBAAkB;IAIlB,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,KAAK,GACX,OAAO,CAAC,2BAA2B,CAAC;IAQvC;;;;;OAKG;IAEH,SAAS,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW;IAerC;;;;;;OAMG;IAEH,SAAS;IAIT;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;IAQxB;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;IAWxB;;;;OAIG;IACH,eAAe,CACb,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,EAAE,MAAM;IASd;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM;IAUhE;;;OAGG;IACH,mBAAmB,CAAC,EAAE,EAAE,eAAe;IAmBvC;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,sBAAsB;CAGzC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"RealtimeLayer.d.ts","sourceRoot":"","sources":["../../../src/ol/layers/RealtimeLayer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,mBAAmB,CAAC;AAKxC,OAAO,OAAO,EAAE,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAc,EACZ,yBAAyB,EAC1B,MAAM,wCAAwC,CAAC;AAEhD,OAAO,EACL,MAAM,EACN,2BAA2B,EAC3B,sBAAsB,EACtB,eAAe,EAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AAK7E,oBAAY,sBAAsB,GAAG,yBAAyB,GAAG;IAC/D,mBAAmB,EAAE,CACnB,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,GAAG,KACT,IAAI,CAAC;IACV,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF;;;;;;;;;;;;;;;;;GAiBG;AAEH,cAAM,aAAc,SAAQ,kBAAY;IACtC,wBAAwB,CAAC,EAAE,OAAO,CAAS;IAE3C;;;;;OAKG;gBACS,OAAO,EAAE,sBAAsB;IAmG3C,WAAW,CAAC,GAAG,EAAE,MAAM;IA4BvB;;OAEG;IACH,aAAa;IAKb;;;;OAIG;IACH,0BAA0B,CAAC,UAAU,EAAE,UAAU;IAgBjD;;;;OAIG;IAEH,kBAAkB,CAAC,aAAa,EAAE,OAAO;IAoBzC;;;;OAIG;IACH,0BAA0B,CAAC,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO;IA2BvE;;OAEG;IACH,kBAAkB;IAIlB,0BAA0B,CACxB,UAAU,EAAE,UAAU,EACtB,OAAO,KAAK,GACX,OAAO,CAAC,2BAA2B,CAAC;IAgBvC;;;;;OAKG;IAEH,SAAS,CAAC,GAAG,EAAE,QAAQ,GAAG,WAAW;IAerC;;;;;;OAMG;IAEH,SAAS;IAiBT;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;IAQxB;;;;;OAKG;IACH,cAAc,CACZ,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,UAAU;IAWxB;;;;OAIG;IACH,eAAe,CACb,UAAU,EAAE,kBAAkB,EAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EACxC,IAAI,EAAE,MAAM;IASd;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM;IAUhE;;;OAGG;IACH,mBAAmB,CAAC,EAAE,EAAE,eAAe;IAmBvC;;;;OAIG;IACH,KAAK,CAAC,UAAU,EAAE,sBAAsB;CAGzC;AAED,eAAe,aAAa,CAAC"}

package/ol/layers/RealtimeLayer.js

@@ -137,7 +137,9 @@ class RealtimeLayer extends mixin(Layer) {
      */
     hasFeatureInfoAtCoordinate(coordinate) {
         if (this.map && this.canvas) {
-            const context = this.canvas.getContext('2d');
+            const context = this.canvas.getContext('2d', {
+                willReadFrequently: true,
+            });
             const pixel = this.map.getPixelFromCoordinate(coordinate);
             return !!(context === null || context === void 0 ? void 0 : context.getImageData(pixel[0] * (this.pixelRatio || 1), pixel[1] * (this.pixelRatio || 1), 1, 1).data[3]);
         }
@@ -198,6 +200,13 @@ class RealtimeLayer extends mixin(Layer) {
         return super.getRefreshTimeInMs(this.map.getView().getZoom());
     }
     getFeatureInfoAtCoordinate(coordinate, options = {}) {
+        if (!this.map || !this.map.getView()) {
+            return Promise.resolve({
+                layer: this,
+                features: [],
+                coordinate,
+            });
+        }
         const resolution = this.map.getView().getResolution();
         return super.getFeatureInfoAtCoordinate(coordinate, Object.assign({ resolution }, options));
     }
@@ -229,6 +238,15 @@ class RealtimeLayer extends mixin(Layer) {
     // eslint-disable-next-line no-unused-vars
     onZoomEnd() {
         super.onZoomEnd();
+        if (this.visible && this.isUpdateBboxOnMoveEnd) {
+            this.setBbox();
+        }
+        if (this.visible &&
+            this.isUpdateBboxOnMoveEnd &&
+            this.userClickInteractions &&
+            this.selectedVehicleId) {
+            this.highlightTrajectory(this.selectedVehicleId);
+        }
     }
     /**
      * Update the cursor style when hovering a vehicle.

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": "2.0.0-beta.67",
+  "version": "2.0.0-beta.69",
   "module": "index.js",
   "exports": {
     ".": "./index.js",
@@ -97,15 +97,16 @@
   },
   "scripts": {
     "apidoc": "esdoc && cp apidoc/index.json doc/src/components/Esdoc",
-    "build": "rm -rf build && yarn tsc && yarn esbuild:iife && cp README.md build/ && cp package.json build/ && cp -R src/types build/ && find build -type f -name '*.test.*' -delete",
+    "build": "yarn build:tsc && yarn esbuild:iife",
+    "build:tsc": "rm -rf build && yarn tsc && cp package.json build/ && cp -R src/types build/ && find build -type f -name '*.test.*' -delete",
     "coverage": "yarn test  --watchAll=false  --coverage --coverageDirectory=coverage",
     "cy:open": "cypress open",
     "cy:test": "start-server-and-test dev http://localhost:3000 'cypress run --browser chrome'",
     "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 doc && yarn dev:examples",
-    "dev:examples": "cd doc && yarn dev",
+    "dev": "rm -rf .next && yarn doc && yarn dev:examples",
+    "dev:examples": "rm -rf .next && cd doc && yarn dev",
     "doc": "yarn build && yarn apidoc && cd doc && rm -rf .next && rm -rf node_modules/mobility-toolbox-js && yarn install --force && yarn build",
     "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",

package/types/common.d.ts

@@ -1,6 +1,7 @@
 import { Feature } from 'ol';
 import { Coordinate } from 'ol/coordinate';
 import { ObjectEvent } from 'ol/Object';
+import { Pixel } from 'ol/pixel';
 import type { RealtimeTrainId } from './realtime';
 import type {
   CopyrightControl as MbCopyrightControl,
@@ -38,6 +39,7 @@ export type RealtimeStyleOptions = {
   delayOutlineColor?: string;
   delayDisplay?: number;
   noInterpolate?: boolean;
+  filter?: FilterFunction;
   getRadius?: (type: number, z: number) => number;
   getBgColor?: (type: number) => string;
   getDelayColor?: (
@@ -55,7 +57,7 @@ export type RealtimeStyleOptions = {
   ) => number;
   getMaxRadiusForText?: () => number;
   getMaxRadiusForStrokeAndDelay?: () => number;
-  filter?: FilterFunction;
+  getScreenPixel?: (pixel: Pixel, viewState: ViewState) => Pixel;
 };
 
 export type RealtimeTrajectories = {

package/types/realtime.d.ts

@@ -165,6 +165,11 @@ export interface RealtimeExtraGeom extends Feature {
   properties: RealtimeExtraGeomProperties;
 }
 
+export interface RealtimeExtraGeomDeleted {
+  type: 'Deleted';
+  properties: RealtimeExtraGeomProperties;
+}
+
 export type RealtimeExtraGeoms = {
   [index: string]: Feature[];
 };
@@ -255,7 +260,7 @@ export interface RealtimeExtraGeomsResponse {
   source: `extra_geoms`;
   timestamp: number;
   client_reference: null;
-  content: RealtimeExtraGeom;
+  content: RealtimeExtraGeom | RealtimeExtraGeomDeleted;
 }
 
 export interface RealtimeStationResponse {

package/README.md

@@ -1,44 +0,0 @@
-# mobility-toolbox-js
-
-Toolbox for JavaScript applications in the domains of mobility and logistics.
-The tools in this library have been inspired by many projects realized for public transport agencies, mobility providers and logistics companies.
-
-[![npm](https://img.shields.io/npm/v/mobility-toolbox-js.svg?style=flat-square)](https://www.npmjs.com/package/mobility-toolbox-js)
-[![Build](https://github.com/geops/mobility-toolbox-js/workflows/Build/badge.svg)](https://github.com/geops/mobility-toolbox-js/actions?query=workflow%3ABuild)
-![Vercel](https://vercelbadge.vercel.app/api/geops/mobility-toolbox-js)
-
-## Documentation and examples
-
-Visit https://mobility-toolbox-js.vercel.app/
-
-## Demos
-
-* Display [real-time vehicle positions and prognosis data](https://mobility.portal.geops.io) on a map.
-* Search for [stops and stations](https://maps.trafimage.ch) all over the world.
-* Get [precise geographic courses](https://routing-demo.geops.io/) for all modes of transport.
-* Generate beautiful [schematic](https://mobility.portal.geops.io/world.geops.networkplans) or [topographic](https://mobility.portal.geops.io) maps for public transport, mobility and logistics.
-
-## Install
-
-Install the library and the peer dependencies:
-
-```bash
-yarn add mobility-toolbox-js ol@6.14.1 mapbox-gl@1 maplibre-gl@2
-```
-
-## Development
-
-```bash
-yarn install
-yarn dev
-```
-
-## Deploy
-
-This library website is deployed automatically using [Vercel](https://vercel.com/geops).
-For Vercel we have to add the nextjs and raw-loader modules in the dev dependencies of the main package.json.
-But those 2 librairies are not need to build the library.
-
-## Version 1.x.x
-
-The master branch is now open for the version 2 development. The version 1 is still available in [1.x.x](https://github.com/geops/mobility-toolbox-js/tree/1.x.x) branch.