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

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 geOps
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,42 @@
+# 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)
+[![Lint / Unit tests](https://github.com/geops/mobility-toolbox-js/workflows/Lint%20/%20Unit%20tests/badge.svg)](https://github.com/geops/mobility-toolbox-js/actions?query=workflow%3ALint%20/%20Unit%20tests)
+![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 maplibre-gl
+```
+
+## 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 needed to build the library.
+

package/common/utils/getLayersAsFlatArray.js

@@ -8,7 +8,7 @@ const getLayersAsFlatArray = (layersOrLayer) => {
     let flatLayers = [];
     layers.forEach((layer) => {
         flatLayers.push(layer);
-        const { children } = layer;
+        const children = layer.children || layer.get('children') || {};
         flatLayers = flatLayers.concat(getLayersAsFlatArray(children || []));
     });
     return flatLayers;

package/mbt.js

@@ -20225,7 +20225,7 @@ uniform ${i3} ${s3} u_${a3};
     let flatLayers = [];
     layers.forEach((layer) => {
       flatLayers.push(layer);
-      const { children } = layer;
+      const children = layer.children || layer.get("children") || {};
       flatLayers = flatLayers.concat(getLayersAsFlatArray(children || []));
     });
     return flatLayers;
@@ -45713,7 +45713,7 @@ uniform ${i3} ${s3} u_${a3};
       this.loaded = false;
       this.olListenersKeys.push(
         // @ts-ignore
-        this.map?.on("change:target", this.loadMbMap)
+        this.map?.on("change:target", this.loadMbMap.bind(this))
       );
       if (!this.map?.getTargetElement()) {
         return;
@@ -45721,7 +45721,7 @@ uniform ${i3} ${s3} u_${a3};
       if (!this.visible) {
         this.olListenersKeys.push(
           // @ts-ignore
-          this.once("change:visible", this.loadMbMap)
+          this.once("change:visible", this.loadMbMap.bind(this))
         );
         return;
       }
@@ -45730,7 +45730,6 @@ uniform ${i3} ${s3} u_${a3};
       container.style.width = "100%";
       container.style.height = "100%";
       this.mbMap = this.createMap({
-        // https://maps.geops.io/styles/t7ravic_v2/style.json',
         style: this.getStyle(),
         container,
         ...this.options?.mapOptions || {}
@@ -46102,11 +46101,11 @@ uniform ${i3} ${s3} u_${a3};
         maplibreMap.once("load", this.onLoad);
       }
       this.olListenersKeys.push(
+        // @ts-expect-error 'load' is a custom event form mobility-toolbox-js
+        this.maplibreLayer.on("load", this.onLoad.bind(this)),
         this.on("change:visible", (evt) => {
           this.applyLayoutVisibility(evt);
         }),
-        // @ts-expect-error 'load' is a custom event form mobility-toolbox-js
-        this.maplibreLayer.on("load", this.onLoad),
         this.on("propertychange", (evt) => {
           if (/(sources|layers|layersFilter|maplibreLayer|beforeId|)/.test(evt.key)) {
             this.detachFromMap();