@wemap/routers 11.3.3 → 11.4.0

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "11.3.3",
+    "version": "11.4.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "e53e577cf8a7f4e9bd1e1be6639d2ebc68319bcc"
+    "gitHead": "c55a6535964fc5298b4855d1e058ab86c367fd6a"
 }

package/src/remote/osrm/OsrmRemoteRouter.ts

@@ -11,6 +11,7 @@ import RemoteRouter from '../RemoteRouter.js';
 import RoutingModeCorrespondanceNotFound from '../RoutingModeCorrespondanceNotFound.js';
 import RemoteRouterServerUnreachable from '../RemoteRouterServerUnreachable.js';
 import { RoutingMode } from '../../model/RoutingMode.js';
+import { RemoteRouterOptions } from '../RemoteRouterOptions.js';
 
 type OsrmCoordinates = Position;
 type OsrmModifier = 'sharp right' | 'sharp left' | 'slight right'
@@ -46,7 +47,7 @@ type OsrmJson = {
     waypoints?: []
 };
 
-type OsrmMode = 'driving' | 'walking' | 'bike' | 'bus' | 'walking';
+type OsrmMode = 'driving' | 'walking' | 'bike' | 'bus' | 'walking' | 'pmr';
 
 /**
  * Input mode correspondance
@@ -75,9 +76,10 @@ class OsrmRemoteRouter extends RemoteRouter {
     async getItineraries(
         endpointUrl: string,
         mode: RoutingMode,
-        waypoints: Coordinates[]
+        waypoints: Coordinates[],
+        options: RemoteRouterOptions = {}
     ) {
-        const url = this.getURL(endpointUrl, mode, waypoints);
+        const url = this.getURL(endpointUrl, mode, waypoints, options);
 
         const res = await (fetch(url).catch(() => {
             throw new RemoteRouterServerUnreachable(this.rname, url);
@@ -101,14 +103,19 @@ class OsrmRemoteRouter extends RemoteRouter {
     getURL(
         endpointUrl: string,
         mode: RoutingMode,
-        waypoints: Coordinates[]
+        waypoints: Coordinates[],
+        options: RemoteRouterOptions = {}
     ) {
 
-        const osrmMode = inputModeCorrespondance.get(mode);
+        let osrmMode = inputModeCorrespondance.get(mode);
         if (!osrmMode) {
             throw new RoutingModeCorrespondanceNotFound(this.rname, mode);
         }
 
+        if ('useStairs' in options && !options.useStairs) {
+            osrmMode = 'pmr';
+        }
+
         let url = endpointUrl + '/route/v1/' + osrmMode + '/';
         url += waypoints.map(waypoint => [waypoint.longitude + ',' + waypoint.latitude]).join(';');
         url += '?geometries=geojson&overview=full&steps=true';

package/src/wemap-multi/WemapMultiRouter.ts

@@ -150,7 +150,7 @@ class WemapMultiRouter {
          */
         if (!ioMapsToTest.length) {
             try {
-                return await RemoteRouterManager.getItinerariesWithFallback(remoteRouters, mode, waypoints);
+                return await RemoteRouterManager.getItinerariesWithFallback(remoteRouters, mode, waypoints, options || undefined);
             } catch (e) {
                 if (!isRoutingError(e)) {
                     throw e;
@@ -215,7 +215,7 @@ class WemapMultiRouter {
          */
         if (!mapWithStart && !mapWithEnd) {
             try {
-                return await RemoteRouterManager.getItinerariesWithFallback(remoteRouters, mode, waypoints);
+                return await RemoteRouterManager.getItinerariesWithFallback(remoteRouters, mode, waypoints, options || undefined);
             } catch (e) {
                 if (!isRoutingError(e)) {
                     throw e;
@@ -249,7 +249,7 @@ class WemapMultiRouter {
             try {
                 ioMapItinerary = mapWithStart.getBestItineraryFromStartToEntryPoints(start, end, wemapOsmRouterOptions);
                 remoteRouterResponse = await RemoteRouterManager.getItinerariesWithFallback(
-                    remoteRouters, mode, [ioMapItinerary.to, end]
+                    remoteRouters, mode, [ioMapItinerary.to, end], options || undefined
                 );
                 if (!remoteRouterResponse.itineraries.length) {
                     throw new NoRouteFoundError(ioMapItinerary.to, end, remoteRouterResponse.error);
@@ -303,7 +303,7 @@ class WemapMultiRouter {
             try {
                 ioMapItinerary = mapWithEnd.getBestItineraryFromEntryPointsToEnd(start, end, wemapOsmRouterOptions);
                 remoteRouterResponse = await RemoteRouterManager.getItinerariesWithFallback(
-                    remoteRouters, mode, [start, ioMapItinerary.from]
+                    remoteRouters, mode, [start, ioMapItinerary.from], options || undefined
                 );
                 if (!remoteRouterResponse.itineraries.length) {
                     throw new NoRouteFoundError(start, ioMapItinerary.from, remoteRouterResponse.error);
@@ -361,7 +361,7 @@ class WemapMultiRouter {
                 ioMapItinerary1 = mapWithStart.getBestItineraryFromStartToEntryPoints(start, end, wemapOsmRouterOptions);
                 ioMapItinerary2 = mapWithEnd.getBestItineraryFromEntryPointsToEnd(start, end, wemapOsmRouterOptions);
                 remoteRouterResponse = await RemoteRouterManager.getItinerariesWithFallback(
-                    remoteRouters, mode, [ioMapItinerary1.to, ioMapItinerary2.from]
+                    remoteRouters, mode, [ioMapItinerary1.to, ioMapItinerary2.from], options || undefined
                 );
                 if (!remoteRouterResponse.itineraries.length) {
                     throw new NoRouteFoundError(ioMapItinerary1.to, ioMapItinerary2.from, remoteRouterResponse.error);