@wemap/routers 11.8.5 → 11.8.7

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "11.8.5",
+    "version": "11.8.7",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "b811f47998e121da18d85857c9a1ddd1ae25c53b"
+    "gitHead": "c04ebfaf659b5b6f575c6a4e77c710ffdcad0d4b"
 }

package/src/model/Itinerary.ts

@@ -12,7 +12,7 @@ import { StepsGenerationRules } from './generateSteps.js';
 import { getDurationFromLength } from '../Utils.js';
 
 
-export type ItineraryMode = 'PT' | 'CAR' | 'BIKE' | 'WALK';
+export type ItineraryMode = 'MULTI' | 'CAR' | 'BIKE' | 'WALK';
 
 export type ItineraryCommon = {
     startTime?: number,
@@ -111,7 +111,7 @@ export default class Itinerary {
             });
 
             if (isPublicTransport) {
-                this._mode = 'PT';
+                this._mode = 'MULTI';
             } else if (isDriving) {
                 this._mode = 'CAR';
             } else if (isBicycle) {

package/src/remote/cityway/CitywayRemoteRouter.spec.ts

@@ -36,7 +36,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const itinerary1 = routerResponse.itineraries[0];
         expect(itinerary1.distance).to.be.closeTo(6887, 1);
         expect(itinerary1.duration).equal(2379);
-        expect(itinerary1.mode).equal('PT');
+        expect(itinerary1.mode).equal('MULTI');
         // Do not work because of the input time format
         expect(itinerary1.startTime).equal(1620659156000);
         expect(itinerary1.endTime).equal(1620661535000);
@@ -85,7 +85,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
         routerResponse.itineraries.forEach(verifyStepsCoherence);
 
-        expect(routerResponse.itineraries[0].mode).equal('PT');
+        expect(routerResponse.itineraries[0].mode).equal('MULTI');
         expect(routerResponse.itineraries[0].legs[1].mode).equal('FUNICULAR');
     });
 
@@ -109,7 +109,7 @@ describe('CitywayRemoteRouter - createRouterResponseFromJson', () => {
         const routerResponse = CitywayRemoteRouter.createRouterResponseFromJson(json, fakeCoords, fakeCoords);
         routerResponse.itineraries.forEach(verifyStepsCoherence);
 
-        expect(routerResponse.itineraries[1].mode).equal('PT');
+        expect(routerResponse.itineraries[1].mode).equal('MULTI');
         expect(routerResponse.itineraries[1].legs[1].mode).equal('TRAM');
         expect(routerResponse.itineraries[1].legs[1].transportInfo?.name).equal('B');
     });

package/src/remote/idfm/IdfmRemoteRouter.spec.ts

@@ -35,7 +35,7 @@ describe('IdfmRouter - createRouterResponseFromJson', () => {
         expect(itinerary1.to.equals(new Coordinates(48.877877, 2.351929))).true;
         expect(itinerary1.distance).to.be.closeTo(5264, 1);
         expect(itinerary1.duration).equal(1842);
-        expect(itinerary1.mode).equal('PT');
+        expect(itinerary1.mode).equal('MULTI');
         // Do not work because of the input time format
         expect(itinerary1.startTime).equal(1637596640000);
         expect(itinerary1.endTime).equal(1637598482000);

package/src/remote/idfm/IdfmRemoteRouter.ts

@@ -193,7 +193,8 @@ class IdfmRemoteRouter extends RemoteRouter {
 
         const routerResponse = this.createRouterResponseFromJson(jsonResponse, waypoints[0], waypoints[1]);
 
-        const sameModeFound = routerResponse.itineraries.some((itinerary) => itinerary.legs.every((leg) => leg.mode === mode));
+        const sameModeFound = routerResponse.itineraries.some((itinerary) => itinerary.mode === mode);
+
         if (!sameModeFound) {
             return new RouterResponse({
                 routerName: this.rname,

package/src/remote/osrm/OsrmRemoteRouter.ts

@@ -268,7 +268,7 @@ class OsrmRemoteRouter extends RemoteRouter {
         const routingModeCorrespondance = new Map<string, RoutingMode>();
         routingModeCorrespondance.set('walking', 'WALK');
         routingModeCorrespondance.set('driving', 'CAR');
-        routingModeCorrespondance.set('bicycle', 'BIKE');
+        routingModeCorrespondance.set('bike', 'BIKE');
         const mode = routingModeCorrespondance.get(routingMode) || 'WALK';
 
         routerResponse.itineraries = jsonRoutes.map(jsonItinerary => {

package/src/remote/otp/OtpRemoteRouter.spec.ts

@@ -41,7 +41,7 @@ describe('OtpRouter - createRouterResponseFromJson', () => {
         expect(itinerary1.startTime).equal(1614607210000);
         expect(itinerary1.endTime).equal(1614608416000);
         expect(itinerary1.legs.length).equal(3);
-        expect(itinerary1.mode).equal('PT');
+        expect(itinerary1.mode).equal('MULTI');
 
         const itinerary1leg1 = itinerary1.legs[0];
         expect(itinerary1leg1.startTime).equal(1614607210000);
@@ -83,7 +83,7 @@ describe('OtpRouter - createRouterResponseFromJson', () => {
         expect(itinerary1.to.equals(new Coordinates(45.18544, 5.73123))).true;
         expect(itinerary1.legs.length).equal(5);
 
-        expect(itinerary1.mode).equal('PT');
+        expect(itinerary1.mode).equal('MULTI');
 
         expect(itinerary1.legs[0].mode).equal('WALK');