@wemap/routers 12.4.0 → 12.5.0

package/index.ts

@@ -24,8 +24,8 @@ export { default as NoRouteFoundError } from './src/graph/NoRouteFoundError.js';
 /* Wemap Router */
 export { default as OsmGraphUtils } from './src/wemap-osm/OsmGraphUtils.js';
 export { default as WemapMultiRouter } from './src/wemap-multi/WemapMultiRouter.js';
-export { default as CustomNetworkMap } from './src/wemap-multi/CustomNetworkMap.js';
-export { default as CustomNetworkMapTester, type Report as CustomNetworkMapTesterReport } from './src/wemap-multi/CustomNetworkMapTester.js';
+export { default as CustomGraphMap } from './src/wemap-multi/CustomGraphMap.js';
+export { default as CustomGraphMapTester, type Report as CustomGraphMapTesterReport } from './src/wemap-multi/CustomGraphMapTester.js';
 
 /* Other Routers */
 export { default as OsrmRemoteRouter } from './src/remote/osrm/OsrmRemoteRouter.js';

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "12.4.0",
+    "version": "12.5.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "3cf7b71eda1ece192aa41a33f3eb964b245d0889"
+    "gitHead": "bf83b03a33aad6df5a09ce47b27bf4c6e9e53033"
 }

package/src/graph/GraphRouter.spec.ts

@@ -293,7 +293,7 @@ describe('GraphRouter - Start and End projection on the same edge', () => {
     ];
 
     const edges = [
-        new Edge(vertices[0], vertices[1], { name: 'e0' }),
+        new Edge(vertices[0], vertices[1], { name: 'e0', isOneway: true }),
     ];
 
     const graph = new Graph(vertices, edges);
@@ -307,4 +307,11 @@ describe('GraphRouter - Start and End projection on the same edge', () => {
         expect(route.hasRoute).is.true;
         expect(route.edges.length).equals(1)
     });
+
+    it('take shortest path oneway reverse', () => {
+        const router = new GraphRouter(graph);
+        const route = getShortestRoute(router, end, start);
+        expect(route.hasRoute).is.false;
+        expect(route.edges.length).equals(0)
+    });
 });

package/src/graph/GraphRouter.ts

@@ -154,7 +154,7 @@ class GraphRouter extends GraphRouterEngine {
                 const distVertexAVertex1 = vertexA.distanceTo(edge.vertex1)
                 for (let j = i + 1; j < vertices.length; j++) {
                     const vertexB = vertices[j];
-                    const distVertexBVertex1 = vertexA.distanceTo(edge.vertex1)
+                    const distVertexBVertex1 = vertexB.distanceTo(edge.vertex1)
                     const reverse = distVertexBVertex1 < distVertexAVertex1;
                     const newEdge = !reverse
                         ? new Edge(vertexA, vertexB, newEdgesOptions)

package/src/wemap-multi/{CustomNetworkMap.spec.ts → CustomGraphMap.spec.ts}

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import CustomNetworkMap from './CustomNetworkMap.js';
+import CustomGraphMap from './CustomGraphMap.js';
 
 const { expect } = chai;
 
@@ -16,24 +16,24 @@ function getMapNameAndContents(assetName: string) {
     return [mapName, osmXmlString];
 }
 
-describe('CustomNetworkMap', () => {
+describe('CustomGraphMap', () => {
 
 
     it('fromOsmXml - biocbon-bergere-rdc-network', async () => {
 
         const [mapName, mapContents] = getMapNameAndContents('biocbon-bergere-rdc-network.osm');
-        const customNetworkMap = CustomNetworkMap.fromOsmXml(mapContents, mapName)!;
-        expect(customNetworkMap.entryPoints.length).equal(1);
-        expect(customNetworkMap.graph.edges).is.not.empty;
+        const customGraphMap = CustomGraphMap.fromOsmXml(mapContents, mapName)!;
+        expect(customGraphMap.entryPoints.length).equal(1);
+        expect(customGraphMap.graph.edges).is.not.empty;
         
     });
 
     it('fromOsmXml - gare-de-lest-network-pp-bounds', async () => {
 
         const [mapName, mapContents] = getMapNameAndContents('gare-de-lest-network-pp-bounds.osm');
-        const customNetworkMap = CustomNetworkMap.fromOsmXml(mapContents, mapName)!;
-        expect(customNetworkMap.entryPoints.length).equal(4);
-        expect(customNetworkMap.graph.edges).is.not.empty;
+        const customGraphMap = CustomGraphMap.fromOsmXml(mapContents, mapName)!;
+        expect(customGraphMap.entryPoints.length).equal(4);
+        expect(customGraphMap.graph.edges).is.not.empty;
         
     });
 

package/src/wemap-multi/{CustomNetworkMap.ts → CustomGraphMap.ts}

@@ -18,7 +18,7 @@ export type ParsingErrors = {
     routingBoundsNotFound: boolean
 }
 
-class CustomNetworkMap {
+export default class CustomGraphMap {
 
     name: string | null;
     graph: Graph;
@@ -115,7 +115,7 @@ class CustomNetworkMap {
             errors.routingBoundsNotFound = true;
         }
         callbackErrors?.(errors);
-        return new CustomNetworkMap(graph, entryPoints, bounds, name);
+        return new CustomGraphMap(graph, entryPoints, bounds, name);
     }
 
     isPointInside(coordinates: Coordinates) {
@@ -211,5 +211,3 @@ class CustomNetworkMap {
     }
 
 }
-
-export default CustomNetworkMap;

package/src/wemap-multi/{CustomNetworkMapTester.spec.ts → CustomGraphMapTester.spec.ts}

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import CustomNetworkMapTester from './CustomNetworkMapTester.js';
+import CustomGraphMapTester from './CustomGraphMapTester.js';
 
 const { expect } = chai;
 
@@ -12,10 +12,10 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 function createReport(fileName: string) {
     const filePath = path.resolve(__dirname, '../../assets/' + fileName);
     const osmXmlString = fs.readFileSync(filePath, 'utf8');
-    return CustomNetworkMapTester.createReport(osmXmlString);
+    return CustomGraphMapTester.createReport(osmXmlString);
 }
 
-describe('CustomNetworkMapTester', () => {
+describe('CustomGraphMapTester', () => {
 
 
     it('multiple-graph-components', async () => {

package/src/wemap-multi/{CustomNetworkMapTester.ts → CustomGraphMapTester.ts}

@@ -1,13 +1,12 @@
 
 import { OsmNode } from '@wemap/osm';
 
-import CustomNetworkMap, { type ParsingErrors } from './CustomNetworkMap.js';
+import CustomGraphMap, { type ParsingErrors } from './CustomGraphMap.js';
 import Vertex from '../graph/Vertex.js';
-import Graph from '../graph/Graph.js';
 
 export type Report = {
-    graph?: Graph,
-    errors: Error[]
+    customGraphMap?: CustomGraphMap,
+    errors: Error[],
 }
 
 export type Error = CouldNotParseFileError
@@ -33,46 +32,46 @@ export type RoutingIoNotOnGraphError = {
     data: OsmNode[]
 }
 
-export default class CustomNetworkMapTester {
+export default class CustomGraphMapTester {
 
     static createReport(osmXmlString: string): Report {
 
-        let customNetworkMapErrors: ParsingErrors | undefined;
-        const networkMap = CustomNetworkMap.fromOsmXml(osmXmlString, null, e => (customNetworkMapErrors = e));
+        let customGraphMapErrors: ParsingErrors | undefined;
+        const customGraphMap = CustomGraphMap.fromOsmXml(osmXmlString, null, e => (customGraphMapErrors = e));
         const errors: Error[] = [];
 
-        if (customNetworkMapErrors?.couldNotParseFile || !networkMap) {
+        if (customGraphMapErrors?.couldNotParseFile || !customGraphMap) {
             errors.push({
                 type: 'could-not-parse-file'
             });
             return { errors };
         }
 
-        const components = networkMap.router.calculateComponents();
+        const components = customGraphMap.router.calculateComponents();
         if (components.length > 1) {
             errors.push({
                 type: 'multiple-graph-components',
                 data: components
             });
         }
-        if (customNetworkMapErrors?.routingBoundsNotFound) {
+        if (customGraphMapErrors?.routingBoundsNotFound) {
             errors.push({
                 type: 'routing-bounds-not-found'
             });
         }
-        if (customNetworkMapErrors?.routingIoNotFound?.length) {
+        if (customGraphMapErrors?.routingIoNotFound?.length) {
             errors.push({
                 type: 'routing-io-not-on-graph',
-                data: customNetworkMapErrors.routingIoNotFound
+                data: customGraphMapErrors.routingIoNotFound
             });
         }
 
-        return { graph: networkMap.graph, errors };
+        return { customGraphMap, errors };
     }
 
     static reportToJson(report: Report) {
         return {
-            graph: report.graph?.toCompressedJson(),
+            graph: report.customGraphMap?.graph?.toCompressedJson(),
             errors: report.errors.map(error => {
                 if (error.type === 'multiple-graph-components') {
                     return { type: error.type, data: error.data.map(c => c.map(v => v.id)) };

package/src/wemap-multi/WemapMultiRouter.spec.ts

@@ -6,7 +6,7 @@ import fetchMock from 'fetch-mock';
 
 import { Coordinates } from '@wemap/geo';
 
-import CustomNetworkMap from './CustomNetworkMap.js';
+import CustomGraphMap from './CustomGraphMap.js';
 import WemapMultiRouter from './WemapMultiRouter.js';
 import OsrmRemoteRouter from '../remote/osrm/OsrmRemoteRouter.js';
 import { type RouterRequest } from '../model/RouterRequest.js';
@@ -30,14 +30,14 @@ function createIOMapFromAsset(assetName: string) {
     const filePath = path.resolve(__dirname, '../../assets/' + assetName);
     const osmXmlString = fs.readFileSync(filePath, 'utf8');
     const mapName = path.parse(assetName).name;
-    return CustomNetworkMap.fromOsmXml(osmXmlString, mapName)!;
+    return CustomGraphMap.fromOsmXml(osmXmlString, mapName)!;
 }
 
 describe('WemapMultiRouter', () => {
 
 
     let router: WemapMultiRouter;
-    let garedelestMap: CustomNetworkMap, biocbonMap: CustomNetworkMap;
+    let garedelestMap: CustomGraphMap, biocbonMap: CustomGraphMap;
     const travelMode = 'WALK';
     const fallbackStrategy: RoutingFallbackStrategy = [{
         name: OsrmRemoteRouter.rname,

package/src/wemap-multi/WemapMultiRouter.ts

@@ -1,7 +1,7 @@
 /* eslint-disable complexity */
 /* eslint-disable max-statements */
 
-import CustomNetworkMap from './CustomNetworkMap.js';
+import CustomGraphMap from './CustomGraphMap.js';
 import RemoteRouterManager, { type RoutingFallbackStrategy } from '../remote/RemoteRouterManager.js';
 import Itinerary from '../model/Itinerary.js';
 import WemapMultiRemoteRouter from '../remote/wemap-multi/WemapMultiRemoteRouter.js';
@@ -13,18 +13,18 @@ import { RemoteRoutingError, WemapMultiRoutingError } from '../RoutingError.js';
 
 class WemapMultiRouter {
 
-    maps: CustomNetworkMap[] = [];
+    maps: CustomGraphMap[] = [];
 
     get rname() {
         return 'wemap-multi';
     }
 
-    addIOMap(customNetworkMap: CustomNetworkMap) {
-        this.maps.push(customNetworkMap);
+    addIOMap(customGraphMap: CustomGraphMap) {
+        this.maps.push(customGraphMap);
     }
 
-    removeIOMap(customNetworkMap: CustomNetworkMap) {
-        this.maps = this.maps.filter(map => map !== customNetworkMap);
+    removeIOMap(customGraphMap: CustomGraphMap) {
+        this.maps = this.maps.filter(map => map !== customGraphMap);
     }
 
     removeAllMaps() {