@wemap/routers 7.0.0 → 7.1.1

package/src/wemap-meta/WemapMetaRouter.js

@@ -1,7 +1,7 @@
 /* eslint-disable complexity */
 /* eslint-disable max-statements */
 
-import { Coordinates } from '@wemap/geo';
+import { Coordinates, NoRouteFoundError } from '@wemap/geo';
 import Logger from '@wemap/logger';
 
 import IOMap from './IOMap.js';
@@ -81,12 +81,12 @@ class WemapMetaRouter {
         const { targetMaps } = options;
         if (targetMaps) {
 
-            ioMapsToTest = this.maps.filter(map => targetMaps.includes(map));
+            ioMapsToTest = this.maps.filter(map => targetMaps.includes(map.name));
 
             // Send a warning if one of the request ioMap (from targetMaps) is not present in this.maps
             if (ioMapsToTest.length !== targetMaps.length) {
-                targetMaps.forEach(map => {
-                    if (!ioMapsToTest.includes(map)) {
+                ioMapsToTest.forEach(map => {
+                    if (!targetMaps.includes(map.name)) {
                         Logger.warn(`IOMap "${map.name}" not found in WemapMetaRouter`);
                     }
                 });
@@ -182,7 +182,15 @@ class WemapMetaRouter {
                 return routerResponse;
             }
 
-            ioMapItinerary = mapWithStart.getBestItineraryFromStartToEntryPoints(start, end, wemapRouterOptions);
+            try {
+                ioMapItinerary = mapWithStart.getBestItineraryFromStartToEntryPoints(start, end, wemapRouterOptions);
+            } catch (e) {
+                if (!(e instanceof NoRouteFoundError)) {
+                    throw e;
+                }
+                routerResponse.error = `${e.message} - on map ${mapWithStart.name}.`;
+                return routerResponse;
+            }
             remoteRouterResponse = await RemoteRouterManager.getItinerariesWithFallback(
                 remoteRouters, mode, [ioMapItinerary.to, end]
             );
@@ -230,7 +238,15 @@ class WemapMetaRouter {
              * calculate all the routes to entrypoints using local router than all the routes with the
              * remote router.
              */
-            ioMapItinerary = mapWithEnd.getBestItineraryFromEntryPointsToEnd(start, end, wemapRouterOptions);
+            try {
+                ioMapItinerary = mapWithEnd.getBestItineraryFromEntryPointsToEnd(start, end, wemapRouterOptions);
+            } catch (e) {
+                if (!(e instanceof NoRouteFoundError)) {
+                    throw e;
+                }
+                routerResponse.error = `${e.message} - on map ${mapWithEnd.name}.`;
+                return routerResponse;
+            }
             remoteRouterResponse = await RemoteRouterManager.getItinerariesWithFallback(
                 remoteRouters, mode, [start, ioMapItinerary.from]
             );
@@ -279,8 +295,25 @@ class WemapMetaRouter {
             return routerResponse;
         }
 
-        const ioMapItinerary1 = mapWithStart.getBestItineraryFromStartToEntryPoints(start, end, wemapRouterOptions);
-        const ioMapItinerary2 = mapWithEnd.getBestItineraryFromEntryPointsToEnd(start, end, wemapRouterOptions);
+        let ioMapItinerary1, ioMapItinerary2;
+        try {
+            ioMapItinerary1 = mapWithStart.getBestItineraryFromStartToEntryPoints(start, end, wemapRouterOptions);
+        } catch (e) {
+            if (!(e instanceof NoRouteFoundError)) {
+                throw e;
+            }
+            routerResponse.error = `${e.message} - on map ${mapWithStart.name}.`;
+            return routerResponse;
+        }
+        try {
+            ioMapItinerary2 = mapWithEnd.getBestItineraryFromEntryPointsToEnd(start, end, wemapRouterOptions);
+        } catch (e) {
+            if (!(e instanceof NoRouteFoundError)) {
+                throw e;
+            }
+            routerResponse.error = `${e.message} - on map ${mapWithEnd.name}.`;
+            return routerResponse;
+        }
         remoteRouterResponse = await RemoteRouterManager.getItinerariesWithFallback(
             remoteRouters, mode, [ioMapItinerary1.to, ioMapItinerary2.from]
         );

package/src/wemap-meta/WemapMetaRouter.spec.js

@@ -1,6 +1,5 @@
 /* eslint-disable max-statements */
 import chai from 'chai';
-import fetch, { Headers } from 'node-fetch';
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
@@ -12,15 +11,24 @@ import IOMap from './IOMap.js';
 import WemapMetaRouter from './WemapMetaRouter.js';
 import Constants from '../Constants.js';
 import WemapMetaRouterOptions from './WemapMetaRouterOptions.js';
-import { OsrmRemoteRouter } from '../../index.js';
+import OsrmRemoteRouter from '../remote/osrm/OsrmRemoteRouter.js';
 import checkRouterResponseType from '../model/RouterResponse.type.spec.js';
 
 const { expect } = chai;
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-// TODO: Remove with node 18
-global.fetch = fetch;
-global.Headers = Headers;
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const assetsPath = path.resolve(__dirname, '../../assets');
+
+function mockFetchWithJsonAsset(assetName) {
+    global.fetch = async () => ({
+        status: 200,
+        json: async () => {
+            const filePath = path.resolve(assetsPath, assetName);
+            const fileString = fs.readFileSync(filePath, 'utf8');
+            return JSON.parse(fileString);
+        }
+    });
+}
 
 function createIOMapFromAsset(assetName) {
     const filePath = path.resolve(__dirname, '../../assets/' + assetName);
@@ -40,7 +48,7 @@ describe('WemapMetaRouter', () => {
 
     const mode = Constants.ROUTING_MODE.WALK;
     const options = new WemapMetaRouterOptions();
-    options.targetMaps = [biocbonMap];
+    options.targetMaps = [biocbonMap.name];
     options.remoteRouters.push({
         name: OsrmRemoteRouter.rname,
         endpointUrl: 'https://routing.getwemap.com'
@@ -73,6 +81,7 @@ describe('WemapMetaRouter', () => {
     it('outdoor to outdoor', async () => {
         const start = new Coordinates(48.8726513, 2.343449);
         const end = new Coordinates(48.8726397, 2.3431657);
+        mockFetchWithJsonAsset('rr-wemap-meta-outdoor-outdoor.json');
 
         const routerResponse = await router.getItineraries(mode, [start, end], options);
         checkRouterResponseType(routerResponse);
@@ -84,6 +93,7 @@ describe('WemapMetaRouter', () => {
     it('outdoor to indoor', async () => {
         const start = new Coordinates(48.8726085, 2.3434289);
         const end = new Coordinates(48.8725694, 2.3433);
+        mockFetchWithJsonAsset('rr-wemap-meta-outdoor-indoor.json');
 
         const routerResponse = await router.getItineraries(mode, [start, end], options);
         checkRouterResponseType(routerResponse);
@@ -95,6 +105,7 @@ describe('WemapMetaRouter', () => {
     it('indoor to outdoor', async () => {
         const start = new Coordinates(48.8725992, 2.343431);
         const end = new Coordinates(48.8726513, 2.343449);
+        mockFetchWithJsonAsset('rr-wemap-meta-indoor-outdoor.json');
 
         const routerResponse = await router.getItineraries(mode, [start, end], options);
         checkRouterResponseType(routerResponse);
@@ -105,9 +116,10 @@ describe('WemapMetaRouter', () => {
 
     it('indoor to outdoor to indoor', async () => {
 
-        options.targetMaps.push(garedelestMap);
+        options.targetMaps.push(garedelestMap.name);
         const start = new Coordinates(48.8725992, 2.343431);
         const end = new Coordinates(48.8772962, 2.3584458, null, new Level(0));
+        mockFetchWithJsonAsset('rr-wemap-meta-indoor-outdoor-indoor.json');
 
         const routerResponse = await router.getItineraries(mode, [start, end], options);
         checkRouterResponseType(routerResponse);

package/src/wemap-meta/WemapMetaRouterOptions.js

@@ -1,11 +1,9 @@
-import IOMap from './IOMap.js';
-
 class WemapMetaRouterOptions {
 
     /** @type {!boolean} */
     useStairs = true;
 
-    /** @type {?(IOMap[])} */
+    /** @type {?(string[])} */
     targetMaps = null;
 
     /**