@wemap/geo 0.3.1 → 0.3.3

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "0.3.1",
+    "version": "0.3.3",
     "bugs": {
         "url": "https://github.com/wemap/wemap-utils-js/issues"
     },
@@ -31,5 +31,5 @@
         "lodash.isnumber": "^3.0.3",
         "lodash.isstring": "^4.0.1"
     },
-    "gitHead": "7b84c9d55646761f75f19235a15be8a1b73b3dbf"
+    "gitHead": "837cec0c81359340e7205ebec13e0d1312c94dd4"
 }

package/src/graph/GraphRouter.js

@@ -76,6 +76,11 @@ class GraphRouter {
 
         const path = this.getShortestPathInternal(start, end, acceptEdgeFn);
 
+        let route;
+        if (path && path.length !== 0) {
+            route = Itinerary.fromNetworkNodes(path, _start, _end);
+        }
+
         if (endNodeCreated) {
             this.removeNodeFromPreviouslyCreatedEdge(endNodeCreated);
         }
@@ -84,11 +89,6 @@ class GraphRouter {
             this.removeNodeFromPreviouslyCreatedEdge(startNodeCreated);
         }
 
-        let route;
-        if (path && path.length !== 0) {
-            route = Itinerary.fromNetworkNodes(path, _start, _end);
-        }
-
         return route;
     }
 
@@ -145,7 +145,7 @@ class GraphRouter {
             vertexNodes = {},
             parentVertices = {},
             path = [];
-        let vertexId = 0;
+        let vertexId = 1;
 
         // Initially, we assume each vertex is unreachable
         this.network.nodes.forEach(vertex => {

package/src/graph/GraphRouter.spec.js

@@ -58,7 +58,7 @@ describe('GraphRouter', () => {
         expect(itinerary.nodes.length).equal(11);
 
         for (let i = 1; i <= 10; i++) {
-            expect(itinerary.nodes[i].data).equal(nodes[i + 6].data);
+            expect(itinerary.nodes[i]).equal(nodes[i + 6]);
         }
 
     });

package/src/graph/Network.js

@@ -22,6 +22,37 @@ class Network {
             || node2 === edge.node1 && node1 === edge.node2
         );
     }
+
+    toString(_nodeToStringFn, _edgeToStringFn) {
+
+        let nodeToStringFn = _nodeToStringFn;
+        if (!nodeToStringFn) {
+            nodeToStringFn = node => `${node.data.name}`;
+        }
+
+        let edgeToStringFn = _edgeToStringFn;
+        if (!_edgeToStringFn) {
+            edgeToStringFn = edge => `${edge.data.name}`;
+        }
+
+        let output
+            = '--- Network ---\n'
+            + `Nodes: ${this.nodes.length}\n`
+            + `Edges: ${this.edges.length}\n`
+            + '---\n'
+            + 'Nodes\n';
+        this.nodes.forEach(node => {
+            output += `${nodeToStringFn(node)} [edges: ${node.edges.length}]\n`;
+        });
+        output += '---\n'
+            + 'Edges\n';
+        this.edges.forEach(edge => {
+            output += `${edgeToStringFn(edge)} `;
+            output += `[${nodeToStringFn(edge.node1)} -- ${nodeToStringFn(edge.node2)}]\n`;
+        });
+        output += '---';
+        return output;
+    }
 }
 
 export default Network;