@wemap/routers 11.1.0 → 11.1.1

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "11.1.0",
+    "version": "11.1.1",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "6cf929d6cf252f85e00f3218d5e04e7a0da832c9"
+    "gitHead": "1fe2ac803a61d5cdb1e3f26185aaeb431bfb482f"
 }

package/src/remote/osrm/OsrmRemoteRouter.spec.ts

@@ -439,6 +439,31 @@ describe('OsrmRemoteRouter - createRouterResponseFromJson', () => {
 
         expect(routerResponse.routerName).equal('osrm');
         expect(routerResponse.itineraries.length).equal(1);
+        expect(routerResponse.itineraries[0].mode).equal('WALK');
+        expect(routerResponse.from.equals(from)).true;
+        expect(routerResponse.to.equals(to)).true;
+
+        const steps = routerResponse.itineraries[0].steps;
+        expect(steps.length).equal(2);
+        expect(steps[1].angle).almost.equal(1.575);
+
+    });
+
+
+    it('RouterResponse - 2 - should return CAR itinerary', () => {
+
+        const filePath = path.resolve(assetsPath, 'itinerary-montpellier-osrm-3.json');
+        const fileString = fs.readFileSync(filePath, 'utf8');
+        const json = JSON.parse(fileString);
+
+        const from = new Coordinates(43.605663, 3.887244);
+        const to = new Coordinates(43.6054106, 3.8878106);
+        const routerResponse = OsrmRemoteRouter.createRouterResponseFromJson(json, from, to, 'driving');
+        routerResponse.itineraries.forEach(verifyStepsCoherence);
+
+        expect(routerResponse.routerName).equal('osrm');
+        expect(routerResponse.itineraries.length).equal(1);
+        expect(routerResponse.itineraries[0].mode).equal('CAR');
         expect(routerResponse.from.equals(from)).true;
         expect(routerResponse.to.equals(to)).true;
 

package/src/remote/osrm/OsrmRemoteRouter.ts

@@ -12,17 +12,6 @@ import RoutingModeCorrespondanceNotFound from '../RoutingModeCorrespondanceNotFo
 import RemoteRouterServerUnreachable from '../RemoteRouterServerUnreachable.js';
 import { RoutingMode } from '../../model/RoutingMode.js';
 
-/**
- * Input mode correspondance
- */
-const inputModeCorrespondance = new Map();
-inputModeCorrespondance.set('CAR', 'driving');
-inputModeCorrespondance.set('WALK', 'walking');
-inputModeCorrespondance.set('BIKE', 'bike');
-inputModeCorrespondance.set('BUS', 'bus');
-inputModeCorrespondance.set('MULTI', 'walking');
-
-
 type OsrmCoordinates = Position;
 type OsrmModifier = 'sharp right' | 'sharp left' | 'slight right'
     | 'slight left' | 'right' | 'left' | 'u turn' | 'straight';
@@ -57,6 +46,18 @@ type OsrmJson = {
     waypoints?: []
 };
 
+type OsrmMode = 'driving' | 'walking' | 'bike' | 'bus' | 'walking';
+
+/**
+ * Input mode correspondance
+ */
+const inputModeCorrespondance = new Map<RoutingMode, OsrmMode>();
+inputModeCorrespondance.set('CAR', 'driving');
+inputModeCorrespondance.set('WALK', 'walking');
+inputModeCorrespondance.set('BIKE', 'bike');
+inputModeCorrespondance.set('BUS', 'bus');
+inputModeCorrespondance.set('MULTI', 'walking');
+
 /**
  * Singleton.
  */
@@ -88,7 +89,10 @@ class OsrmRemoteRouter extends RemoteRouter {
 
         const from = waypoints[0];
         const to = waypoints[waypoints.length - 1];
-        return this.createRouterResponseFromJson(jsonResponse, from, to);
+
+        const osrmMode = inputModeCorrespondance.get(mode);
+
+        return this.createRouterResponseFromJson(jsonResponse, from, to, osrmMode);
     }
 
     /**
@@ -245,7 +249,7 @@ class OsrmRemoteRouter extends RemoteRouter {
         json: OsrmJson,
         from: Coordinates,
         to: Coordinates,
-        routingMode = 'walking') {
+        routingMode: OsrmMode = 'walking') {
 
         const routerResponse = new RouterResponse({ routerName: this.rname, from, to });
 

package/src/wemap-osm/OsmRouter.spec.ts

@@ -71,7 +71,7 @@ describe('OsmRouter - Multi-level itinerary', () => {
         expect(steps[0].previousBearing).almost.equals(1.778);
         expect(steps[0].nextBearing).almost.equals(0.207);
         expect(steps[0].distance).almost.equals(2.328);
-        expect(steps[0].duration).almost.equals(1.676);
+        expect(steps[0].duration).almost.equals(2.095);
         expect(steps[0].firstStep).true;
         expect(steps[0].lastStep).false;
         expect(steps[0].levelChange).is.null;
@@ -171,7 +171,7 @@ describe('OsmRouter - Conveying', () => {
     it('do not use oneway conveying', () => {
 
         const start = new Coordinates(48.8445715, 2.3718927, null, 0);
-        const end = new Coordinates(48.84443728652394, 2.3721685669363524, null, -1);
+        const end = new Coordinates(48.8444574, 2.3720728, null, -1);
 
         const itinerary = router.getShortestPath(start, end);
         expect(itinerary).is.not.undefined;
@@ -179,7 +179,7 @@ describe('OsmRouter - Conveying', () => {
 
         const itineraryOtherWay = router.getShortestPath(end, start);
         expect(itineraryOtherWay).is.not.undefined;
-        expect(getNodesNames(itineraryOtherWay)).deep.equals(['proj on null (tmp)', 'p6', 'p7', 'p10', 'p11']);
+        expect(getNodesNames(itineraryOtherWay)).deep.equals(['proj on null (tmp)', 'p7', 'p10', 'p11']);
     });
 });
 
@@ -217,7 +217,7 @@ describe('OsmRouter - Instruction stairs same level', () => {
     }
 
     const expectLevelChangeAtSecondStep = (steps: Step[], direction: 'up' | 'down', difference: number) => {
-        expect(steps.length).equals(2);
+        expect(steps.length).equals(3);
         expect(steps[1].levelChange).is.not.null;
         expect(steps[1].levelChange?.direction).equal(direction);
         expect(steps[1].levelChange?.difference).equal(difference);
@@ -236,8 +236,7 @@ describe('OsmRouter - Instruction stairs same level', () => {
         expectLevelChangeAtSecondStep(getItinerary('start7', 'end7').steps, 'up', 1);
         expect(getItinerary('start8', 'end8').steps.length).equal(1);
         expectLevelChangeAtSecondStep(getItinerary('start9', 'end9').steps, 'up', 1);
-        // This one should emit a warning
-        expectLevelChangeAtSecondStep(getItinerary('start10', 'end10').steps, 'up', 1);
+        expectLevelChangeAtSecondStep(getItinerary('start10', 'end10').steps, 'down', 1); // incline > diff of levels
     });
 });