@wemap/routers 12.1.0 → 12.2.0

package/index.ts

@@ -23,8 +23,6 @@ export { default as NoRouteFoundError } from './src/graph/NoRouteFoundError.js';
 
 /* Wemap Router */
 export { default as OsmGraphUtils } from './src/wemap-osm/OsmGraphUtils.js';
-export { type OsmRouterOptions } from './src/wemap-osm/OsmRouterOptions.js';
-
 export { default as WemapMultiRouter } from './src/wemap-multi/WemapMultiRouter.js';
 export { default as CustomNetworkMap } from './src/wemap-multi/CustomNetworkMap.js';
 

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "12.1.0",
+    "version": "12.2.0",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "a9ae25d8931032e8779034182c62aa6af1528819"
+    "gitHead": "6dda458e79cb7bc9bb63de3db2d000823672c3ca"
 }

package/src/graph/GraphRouterEngine.ts

@@ -149,39 +149,7 @@ export default class GraphRouterEngine {
                 }
             }
 
-            // edges.forEach(edge => {
-            //     // if (edge.properties.isOneway) {
-            //     //     console.log("isOneway")
-            //     //     return edge.vertex1 == u
-            //     // } else {
-            //     //     console.log(`${edge.id} => keep: ${cond} - ${JSON.stringify(edge.properties)} [f: ${firstPart}, s: ${secondPart}]`);
-            //     // }
-            //     // return edge.vertex1 == u || edge.vertex2 == u
-            //     const firstPart = edge.vertex1 == u;
-            //     const secondPart = !edge.properties.isOneway && edge.vertex2 == u;
-            //     const cond = edge.vertex1 == u || !edge.properties.isOneway && edge.vertex2 == u
-            //     console.log(`${edge.id} => keep: ${cond} - ${JSON.stringify(edge.properties)} [f: ${firstPart}, s: ${secondPart}]`);
-            // })
-
-            // const mEdges = edges
-            //     .filter(edge => edge.vertex1 == u || !edge.properties.isOneway && edge.vertex2 == u)
-            //     .map(edge => `${edge.id} - ${edge.properties.name}`)
-            // console.log('_-------_')
-            // console.log(`Processing vertex ${u.id} (${u.properties.name})`);
-            // console.log(`Calc for edges: ${mEdges}`);
-
-            // if (u.properties.name === 'p11') {
-            //     console.log(u);
-            // }
-
-
             edges
-                // .filter(edge => {
-                //     if (edge.properties.isOneway) {
-                //         return edge.vertex1 == u
-                //     }
-                //     return edge.vertex1 == u || edge.vertex2 == u
-                // })
                 .filter(edge => edge.vertex1 == u || !edge.properties.isOneway && edge.vertex2 == u)
                 .forEach(edge => {
                     const v = u === edge.vertex1 ? edge.vertex2 : edge.vertex1;
@@ -206,4 +174,43 @@ export default class GraphRouterEngine {
     ): GraphRouterEngineResults {
         return this.calculateShortestPathToMultipleDestinationsByVertex(source, [target], options, inputVertices, inputEdges);
     }
+
+    // https://en.wikipedia.org/wiki/Component_(graph_theory)
+    calculateComponents() {
+
+        function shiftSet<T>(set: Set<T>): T {
+            const firstValue = set.values().next().value as T;
+            set.delete(firstValue);
+            return firstValue;
+        }
+
+        const verticesToTest = new Set<Vertex>(this.graph.vertices);
+        let components: Vertex[][] = [];
+
+        while (verticesToTest.size > 0) {
+            const vertexToTest = shiftSet(verticesToTest);
+            const otherVertices = this.graph.vertices.filter(v => v.id !== vertexToTest.id);
+            const result = this.calculateShortestPathToMultipleDestinationsByVertex(vertexToTest, otherVertices);
+            const reachedVertices = otherVertices.filter(ov => result.weightedDistance(ov) !== null);
+
+            components.push([vertexToTest, ...reachedVertices]);
+            reachedVertices.forEach(rv => verticesToTest.delete(rv));
+        }
+
+        // As graph is ordered, fuse components with same vertices
+        for (let i = 0; i < components.length - 1; i++) {
+            const component1 = components[i];
+            for (let j = i + 1; j < components.length; j++) {
+                const component2 = components[j];
+                const componentsIntersect = component2.some(v => component1.includes(v));
+                if (componentsIntersect) {
+                    component1.push(...component2);
+                    components = components.filter(component => component !== component2);
+                }
+            }
+        }
+
+        return components.map(c => [... new Set(c)]);
+    }
+
 }

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

@@ -265,3 +265,28 @@ describe('OsmRouter - getTrip', () => {
         expect(router.getShortestTrip([p1, p2, p3, p4, p5, p6])).is.empty;
     });
 });
+
+
+describe('OsmRouter - create graph components', () => {
+
+    const networkModel = loadGraph('components.osm');
+    const router = new GraphRouter(networkModel);
+
+    const arraysEqual = <T>(a: T[], b: T[]) => JSON.stringify(a.sort()) === JSON.stringify(b.sort());
+    const findComponent = (components: Vertex[][], vertexNames: string[]) =>
+        components.find(c => arraysEqual(c.map(v => v.properties.name), vertexNames))
+
+    it('createComponents()', () => {
+        const components = router.calculateComponents();
+
+        // console.log(JSON.stringify(components.map(c => c.map(v => v.properties.name)), null, 4));
+        expect(components.length).equal(6);
+        expect(findComponent(components, ['p1', 'p2', 'p3', 'p4'])).to.be.not.undefined;
+        expect(findComponent(components, ['p11', 'p12', 'p13'])).to.be.not.undefined;
+        expect(findComponent(components, ['p13', 'p14'])).to.be.not.undefined;
+        expect(findComponent(components, ['p21', 'p22'])).to.be.not.undefined;
+        expect(findComponent(components, ['p31', 'p32', 'p32', 'p33', 'p34'])).to.be.not.undefined;
+        expect(findComponent(components, ['p41', 'p42', 'p43', 'p44', 'p45', 'p46', 'p47', 'p48'])).to.be.not.undefined;
+    });
+
+});

package/src/wemap-osm/OsmRouterOptions.ts

@@ -1,13 +0,0 @@
-// TODO: remove
-export type OsmRouterOptions = {
-
-    useStairs?: boolean;
-
-    useEscalators?: boolean;
-
-    useElevators?: boolean;
-
-    isTrip?: boolean;
-
-    tspTempCoeff?: number;
-}