@wemap/routers 7.1.0 → 7.2.0

package/assets/rr-wemap-meta-multi-level.json

@@ -0,0 +1,256 @@
+{
+    "routerName": [
+        "wemap-meta",
+        "wemap"
+    ],
+    "from": [
+        43.6091851,
+        3.8841386,
+        1.5999999999999996,
+        "2"
+    ],
+    "to": [
+        43.6093145,
+        3.8842585,
+        0,
+        "1"
+    ],
+    "itineraries": [
+        {
+            "from": [
+                43.6091851,
+                3.8841386,
+                1.5999999999999996,
+                "2"
+            ],
+            "to": [
+                43.6093145,
+                3.8842585,
+                0,
+                "1"
+            ],
+            "distance": 42.54181917885857,
+            "duration": 30.630109808778165,
+            "mode": "WALK",
+            "legs": [
+                {
+                    "mode": "WALK",
+                    "from": {
+                        "coords": [
+                            43.6091851,
+                            3.8841386,
+                            1.5999999999999996,
+                            "2"
+                        ]
+                    },
+                    "to": {
+                        "coords": [
+                            43.6093145,
+                            3.8842585,
+                            0,
+                            "1"
+                        ]
+                    },
+                    "distance": 42.54181917885857,
+                    "duration": 30.630109808778165,
+                    "coords": [
+                        [
+                            43.60918687807148,
+                            3.884139117496946,
+                            1.5999999999999996,
+                            "2"
+                        ],
+                        [
+                            43.60917494597,
+                            3.88421731753,
+                            null,
+                            "2"
+                        ],
+                        [
+                            43.60927603206,
+                            3.88424673798,
+                            null,
+                            "2"
+                        ],
+                        [
+                            43.60929353543,
+                            3.88425183223,
+                            null,
+                            "2"
+                        ],
+                        [
+                            43.60930219142,
+                            3.88427017086,
+                            null,
+                            "2"
+                        ],
+                        [
+                            43.60931231268,
+                            3.8842731166,
+                            null,
+                            "2"
+                        ],
+                        [
+                            43.60932336323,
+                            3.884200898,
+                            null,
+                            "2"
+                        ],
+                        [
+                            43.6093629216,
+                            3.884212726,
+                            null,
+                            "1;2"
+                        ],
+                        [
+                            43.60935965678,
+                            3.8842335535,
+                            null,
+                            "1;2"
+                        ],
+                        [
+                            43.60932022256,
+                            3.88422176261,
+                            null,
+                            "1"
+                        ],
+                        [
+                            43.60931456597898,
+                            3.884258519367876,
+                            0,
+                            "1"
+                        ]
+                    ],
+                    "steps": [
+                        {
+                            "number": 1,
+                            "coords": [
+                                43.60918687807148,
+                                3.884139117496946,
+                                1.5999999999999996,
+                                "2"
+                            ],
+                            "angle": 1.570796452892035,
+                            "previousBearing": 0.20769475566724294,
+                            "nextBearing": 1.7784909563650013,
+                            "distance": 6.441526226002801,
+                            "_idCoordsInLeg": 0,
+                            "firstStep": true,
+                            "duration": 4.637898882722017
+                        },
+                        {
+                            "number": 2,
+                            "coords": [
+                                43.60917494597,
+                                3.88421731753,
+                                null,
+                                "2"
+                            ],
+                            "angle": -1.5707958396207153,
+                            "previousBearing": 1.7784909563650013,
+                            "nextBearing": 0.20769414239592354,
+                            "distance": 13.491259592782844,
+                            "_idCoordsInLeg": 1,
+                            "duration": 9.71370690680365
+                        },
+                        {
+                            "number": 3,
+                            "coords": [
+                                43.60929353543,
+                                3.88425183223,
+                                null,
+                                "2"
+                            ],
+                            "angle": 2.3561946292270304,
+                            "previousBearing": 0.20769440021825977,
+                            "nextBearing": 0.9930924245810223,
+                            "distance": 1.764470280281753,
+                            "_idCoordsInLeg": 3,
+                            "duration": 1.2704186018028611
+                        },
+                        {
+                            "number": 4,
+                            "coords": [
+                                43.60930219142,
+                                3.88427017086,
+                                null,
+                                "2"
+                            ],
+                            "angle": -2.35619514761237,
+                            "previousBearing": 0.9930924245810223,
+                            "nextBearing": 0.20769491860359898,
+                            "distance": 1.1514392872995367,
+                            "_idCoordsInLeg": 4,
+                            "duration": 0.8290362868556649
+                        },
+                        {
+                            "number": 5,
+                            "coords": [
+                                43.60931231268,
+                                3.8842731166,
+                                null,
+                                "2"
+                            ],
+                            "angle": -1.571367193550253,
+                            "previousBearing": 0.20769491860359898,
+                            "nextBearing": -1.3625305414359412,
+                            "distance": 5.9495234765598815,
+                            "_idCoordsInLeg": 5,
+                            "duration": 4.283656903123116
+                        },
+                        {
+                            "number": 6,
+                            "coords": [
+                                43.60932336323,
+                                3.884200898,
+                                null,
+                                "2"
+                            ],
+                            "angle": 1.5658578729882155,
+                            "previousBearing": -1.3625305414359412,
+                            "nextBearing": 0.213204239165637,
+                            "distance": 10.714755603461356,
+                            "_idCoordsInLeg": 6,
+                            "duration": 7.714624034492179,
+                            "levelChange": {
+                                "direction": "down",
+                                "difference": -1,
+                                "type": "stairs"
+                            }
+                        },
+                        {
+                            "number": 7,
+                            "coords": [
+                                43.60932022256,
+                                3.88422176261,
+                                null,
+                                "1"
+                            ],
+                            "angle": -1.567016008190605,
+                            "previousBearing": -2.928388068274625,
+                            "nextBearing": 1.780220593505773,
+                            "distance": 3.0288447124703852,
+                            "_idCoordsInLeg": 9,
+                            "duration": 2.180768192978679
+                        },
+                        {
+                            "number": 8,
+                            "coords": [
+                                43.60931456597898,
+                                3.884258519367876,
+                                0,
+                                "1"
+                            ],
+                            "angle": 1.570792167125268,
+                            "previousBearing": 1.780220593505773,
+                            "nextBearing": -2.932164227209288,
+                            "distance": 0.007508814013397345,
+                            "_idCoordsInLeg": 10,
+                            "lastStep": true
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}

package/index.js

@@ -26,6 +26,7 @@ export { default as IdfmRemoteRouter } from './src/remote/idfm/IdfmRemoteRouter.
 export { default as WemapMetaRemoteRouter } from './src/remote/wemap-meta/WemapMetaRemoteRouter.js';
 export { default as WemapMetaRemoteRouterOptions } from './src/remote/wemap-meta/WemapMetaRemoteRouterOptions.js';
 export { default as WemapMetaRemoteRouterPayload } from './src/remote/wemap-meta/WemapMetaRemoteRouterPayload.js';
+export { default as RemoteRouterManager } from './src/remote/RemoteRouterManager.js';
 
 
 /* Others */

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "7.1.0",
+    "version": "7.2.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -29,10 +29,10 @@
         "@turf/boolean-point-in-polygon": "^6.5.0",
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
-        "@wemap/geo": "^7.1.0",
+        "@wemap/geo": "^7.2.0",
         "@wemap/logger": "^7.0.0",
         "@wemap/maths": "^7.0.0",
-        "@wemap/osm": "^7.1.0"
+        "@wemap/osm": "^7.2.0"
     },
-    "gitHead": "1694bc27d63609042777c93a0dea7353db07b88d"
+    "gitHead": "a4a796c2870c6b1182a0c69fe753bc4012faf0c1"
 }

package/src/Utils.js

@@ -1,3 +1,6 @@
+
+import RouterResponse from './model/RouterResponse.js';
+
 /**
  * Get route duration
  * @param {Number} speed in km/h
@@ -6,3 +9,55 @@
 export function getDurationFromLength(length, speed = 5) {
     return length / (speed * 1000 / 3600);
 }
+
+/* eslint-disable max-statements */
+/* eslint-disable max-depth */
+/**
+ * @param {RouterResponse} routerResponse
+ * @param {Number} levelFactor
+ */
+export function multiplyRouterResponseLevel(routerResponse, levelFactor) {
+    if (routerResponse.from.level) {
+        routerResponse.from.level.multiplyBy(levelFactor);
+    }
+    if (routerResponse.to.level) {
+        routerResponse.to.level.multiplyBy(levelFactor);
+    }
+    for (const itinerary of routerResponse.itineraries) {
+        if (itinerary.from.level) {
+            itinerary.from.level.multiplyBy(levelFactor);
+        }
+        if (itinerary.to.level) {
+            itinerary.to.level.multiplyBy(levelFactor);
+        }
+
+        for (const leg of itinerary.legs) {
+            if (leg.from.coords.level) {
+                leg.from.coords.level.multiplyBy(levelFactor);
+            }
+            if (leg.to.coords.level) {
+                leg.to.coords.level.multiplyBy(levelFactor);
+            }
+            for (const coords of leg.coords) {
+                if (coords.level) {
+                    coords.level.multiplyBy(levelFactor);
+                }
+            }
+            if (leg.steps) {
+                for (const step of leg.steps) {
+                    if (step.coords.level) {
+                        step.coords.level.multiplyBy(levelFactor);
+                    }
+                }
+            }
+        }
+
+        if (itinerary._coords) {
+            for (const coords of itinerary._coords) {
+                if (coords.level) {
+                    coords.level.multiplyBy(levelFactor);
+                }
+            }
+        }
+    }
+}

package/src/Utils.spec.js

@@ -0,0 +1,60 @@
+/* eslint-disable max-statements */
+import chai from 'chai';
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import RouterResponse from './model/RouterResponse.js';
+import { multiplyRouterResponseLevel } from './Utils.js';
+
+const { expect } = chai;
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const assetsPath = path.resolve(__dirname, '../assets');
+
+describe('Routers Utils', () => {
+
+    it('multiplyRouterResponseLevel', () => {
+
+        const filePath = path.resolve(assetsPath, 'rr-wemap-meta-multi-level.json');
+        const fileString = fs.readFileSync(filePath, 'utf8');
+        const json = JSON.parse(fileString);
+
+        const routerResponse = RouterResponse.fromJson(json);
+        multiplyRouterResponseLevel(routerResponse, 5);
+
+        expect(routerResponse.from.level.val).equal(10);
+        expect(routerResponse.to.level.val).equal(5);
+
+        const itinerary = routerResponse.itineraries[0];
+        expect(itinerary.from.level.val).equal(10);
+        expect(itinerary.to.level.val).equal(5);
+
+        const leg = itinerary.legs[0];
+        expect(leg.from.coords.level.val).equal(10);
+        expect(leg.to.coords.level.val).equal(5);
+
+        for (let i = 0; i < leg.coords.length; i++) {
+            if (i <= 6) {
+                expect(leg.coords[i].level.val).equal(10);
+            } else if (i <= 8) {
+                expect(leg.coords[i].level.up).equal(10);
+                expect(leg.coords[i].level.low).equal(5);
+            } else {
+                expect(leg.coords[i].level.val).equal(5);
+            }
+        }
+
+        const { steps } = leg;
+        for (let i = 0; i < steps.length; i++) {
+            if (i <= 5) {
+                expect(steps[i].coords.level.val).equal(10);
+            } else {
+                expect(steps[i].coords.level.val).equal(5);
+            }
+        }
+    });
+
+
+});
+

package/src/remote/RemoteRouterManager.js

@@ -7,6 +7,7 @@ import DeutscheBahnRemoteRouter from './deutsche-bahn/DeutscheBahnRemoteRouter.j
 import IdfmRemoteRouter from './idfm/IdfmRemoteRouter.js';
 import OsrmRemoteRouter from './osrm/OsrmRemoteRouter.js';
 import OtpRemoteRouter from './otp/OtpRemoteRouter.js';
+import WemapMetaRemoteRouter from './wemap-meta/WemapMetaRemoteRouter.js';
 import RemoteRouterOptions from './RemoteRouterOptions.js';
 import RemoteRouterServerUnreachable from './RemoteRouterServerUnreachable.js';
 import RoutingModeCorrespondanceNotFound from './RoutingModeCorrespondanceNotFound.js';
@@ -23,7 +24,8 @@ class RemoteRouterManager {
         DeutscheBahnRemoteRouter,
         IdfmRemoteRouter,
         OsrmRemoteRouter,
-        OtpRemoteRouter
+        OtpRemoteRouter,
+        WemapMetaRemoteRouter
     ];
 
     /**

package/src/wemap-meta/WemapMetaRouter.js

@@ -118,6 +118,8 @@ class WemapMetaRouter {
         routerResponse.from = start;
         routerResponse.to = end;
 
+        /** @type {Itinerary} */
+        let ioMapItinerary;
 
         // Find the first map where the "start" is inside.
         const mapWithStart = ioMapsToTest.find(map => map.isPointInside(start));
@@ -134,9 +136,17 @@ class WemapMetaRouter {
          */
         if (mapWithStart && mapWithStart.isPointInside(end)) {
 
-            const itinerary = mapWithStart.getItineraryInsideMap(start, end, wemapRouterOptions);
+            try {
+                ioMapItinerary = mapWithStart.getItineraryInsideMap(start, end, wemapRouterOptions);
+            } catch (e) {
+                if (!(e instanceof NoRouteFoundError)) {
+                    throw e;
+                }
+                routerResponse.error = `${e.message} - on map ${mapWithStart.name}.`;
+                return routerResponse;
+            }
 
-            routerResponse.itineraries.push(itinerary);
+            routerResponse.itineraries.push(ioMapItinerary);
             routerResponse.routerName = [this.rname, WemapRouter.rname];
 
             return routerResponse;
@@ -158,8 +168,6 @@ class WemapMetaRouter {
         /** @type {RouterResponse} */
         let remoteRouterResponse;
 
-        /** @type {Itinerary} */
-        let ioMapItinerary;
 
         /**
          * Case 3