mobility-toolbox-js 1.3.9 → 1.3.11

package/mapbox/controls/CopyrightControl.js

@@ -1,6 +1,6 @@
 import Control from '../../common/controls/Control';
 import mixin from '../../common/mixins/CopyrightMixin';
-import getMapboxMapCopyrights from '../../common/utils/getMapboxMapCopyrights';
+import { getMapboxMapCopyrights } from '../../common/utils';
 
 /**
  * Display layer's copyrights.

package/ol/controls/RoutingControl.js

@@ -10,6 +10,14 @@ import RoutingAPI from '../../api/routing/RoutingAPI';
 import Control from '../../common/controls/Control';
 import RoutingLayer from '../layers/RoutingLayer';
 
+const getFlatCoordinatesFromSegments = (segmentArray) => {
+  const coords = [];
+  segmentArray.forEach((seg) => {
+    coords.push(...seg.getGeometry().getCoordinates());
+  });
+  return coords;
+};
+
 /**
  * Display a route of a specified mean of transport.
  *
@@ -85,6 +93,9 @@ class RoutingControl extends Control {
     /** @ignore */
     this.stopsApiKey = options.stopsApiKey || this.apiKey;
 
+    /** @ignore */
+    this.segments = [];
+
     /** @ignore */
     this.stopsApiUrl =
       options.stopsApiUrl || 'https://api.geops.io/stops/v1/lookup/';
@@ -252,13 +263,38 @@ class RoutingControl extends Control {
             this.abortController,
           )
           .then((featureCollection) => {
-            const segments = this.format.readFeatures(featureCollection);
+            this.segments = this.format.readFeatures(featureCollection);
+
+            if (this.mot === 'foot') {
+              // 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],
+                  )
+                    ? resultVias
+                    : [...resultVias, segTrg];
+                },
+                [],
+              );
+
+              // Create LineString features from segments with same unique value
+              this.segments = uniqueVias.map((via) => {
+                const viaSegments = this.segments.filter((seg) => {
+                  const segTrg = seg.get('trg');
+                  return segTrg[0] === via[0] && segTrg[1] === via[1];
+                });
+
+                const coords = getFlatCoordinatesFromSegments(viaSegments);
+                return new Feature({
+                  geometry: new LineString(coords),
+                });
+              });
+            }
 
             // Create the new route. This route will be modifiable by the Modifiy interaction.
-            const coords = [];
-            segments.forEach((seg) => {
-              coords.push(...seg.getGeometry().getCoordinates());
-            });
+            const coords = getFlatCoordinatesFromSegments(this.segments);
 
             const routeFeature = new Feature({
               geometry: new LineString(coords),
@@ -274,6 +310,7 @@ class RoutingControl extends Control {
               // Ignore abort error
               return;
             }
+            this.segments = [];
             // Dispatch error event and execute error function
             this.dispatchEvent({
               type: 'error',

package/ol/layers/MapboxLayer.js

@@ -5,8 +5,7 @@ import Source from 'ol/source/Source';
 import OLLayer from 'ol/layer/Layer';
 import GeoJSON from 'ol/format/GeoJSON';
 import Layer from './Layer';
-import getMapboxMapCopyrights from '../../common/utils/getMapboxMapCopyrights';
-import getMapboxStyleUrl from '../../common/utils/getMapboxStyleUrl';
+import { getMapboxMapCopyrights, getMapboxStyleUrl } from '../../common/utils';
 
 /**
  * A class representing Mapboxlayer to display on BasicMap

package/ol/layers/MapboxStyleLayer.js

@@ -162,10 +162,10 @@ class MapboxStyleLayer extends Layer {
 
     // Apply the visibiltity when layer's visibility change.
     this.olListenersKeys.push(
-      this.on('change:visible', () => {
+      this.on('change:visible', (evt) => {
         // Once the map is loaded we can apply vsiiblity without waiting
         // the style. Mapbox take care of the application of style changes.
-        this.applyLayoutVisibility();
+        this.applyLayoutVisibility(evt);
       }),
     );
 
@@ -393,6 +393,7 @@ class MapboxStyleLayer extends Layer {
 
   /**
    * Apply visibility to style layers that fits the styleLayersFilter function.
+   * @param {Event} evt Layer's event that has called the function.
    * @private
    */
   applyLayoutVisibility() {

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": "1.3.9",
+  "version": "1.3.11",
   "main": "index.js",
   "module": "module.js",
   "dependencies": {
@@ -161,7 +161,7 @@
     "./module": "./module.js",
     "./api": "./api/index.js",
     "./common": "./common/*.js",
-    "./common/utils": "./common/utils/*.js",
+    "./common/utils": "./common/utils/index.js",
     "./mapbox": "./mapbox/index.js",
     "./ol": "./ol/index.js"
   },