@wemap/geo 5.0.0 → 5.1.1

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/geo"
     },
     "name": "@wemap/geo",
-    "version": "5.0.0",
+    "version": "5.1.1",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -28,7 +28,7 @@
     "license": "ISC",
     "dependencies": {
         "@wemap/logger": "^5.0.0",
-        "@wemap/maths": "^5.0.0"
+        "@wemap/maths": "^5.1.1"
     },
-    "gitHead": "73607e294f29d3f9a41673bfc25ad9489a1da7f4"
+    "gitHead": "31bd3f410dc3c5beebbd2de934d393f4e8e10396"
 }

package/src/router/GraphRouter.js

@@ -250,7 +250,7 @@ class GraphRouter {
         let endId = end.uniqueRouterId;
         while (parentVertices[endId]) {
             path.unshift(vertexNodes[endId]);
-            edgesWeights.push(distanceMap[endId] - distanceMap[parentVertices[endId]]);
+            edgesWeights.unshift(distanceMap[endId] - distanceMap[parentVertices[endId]]);
             endId = parentVertices[endId];
         }
         if (path.length !== 0) {

package/src/router/GraphRouter.spec.js

@@ -1,4 +1,5 @@
 import chai from 'chai';
+import chaiAlmost from 'chai-almost';
 
 import Coordinates from '../coordinates/Coordinates.js';
 import Level from '../coordinates/Level.js';
@@ -13,6 +14,7 @@ import NoRouteFoundError from './NoRouteFoundError.js';
 import GraphRouterOptions from './GraphRouterOptions.js';
 
 const { expect } = chai;
+chai.use(chaiAlmost(1e-3));
 
 const networkDidNotChange = (networkAfter, nodesBefore, edgesBefore) => {
 
@@ -244,9 +246,22 @@ describe('GraphRouter - Itinerary one way', () => {
 
 describe('GraphRouter - Itinerary with weight', () => {
 
-    const { edges, network } = createModel();
+    const { edges, network, start, end } = createModel();
     edges[1].mood = true;
 
+    it('Verify weight', () => {
+
+        router = new GraphRouter(network);
+
+        itinerary = getShortestPath(router, start, end, options);
+        expect(itinerary).is.not.undefined;
+        expect(getNodesNames(itinerary)).deep.equals(['p0', 'p1', 'p2']);
+        expect(itinerary.edges.length).equals(2);
+        expect(itinerary.edgesWeights.length).equals(2);
+        expect(itinerary.edgesWeights[0]).almost.equals(30.696);
+        expect(itinerary.edgesWeights[1]).almost.equals(20.604);
+    });
+
     const defaultWeighEdgeFn = new GraphRouterOptions().weightEdgeFn;
     const weightFn = edge => {
         let duration = defaultWeighEdgeFn(edge);
@@ -262,13 +277,13 @@ describe('GraphRouter - Itinerary with weight', () => {
         options = new GraphRouterOptions();
         options.weightEdgeFn = weightFn;
 
-        itinerary = getShortestPath(router,
-            network.nodes.find(node => node.builtFrom === 'p0'),
-            network.nodes.find(node => node.builtFrom === 'p2'),
-            options
-        );
+        itinerary = getShortestPath(router, start, end, options);
 
         expect(itinerary).is.not.undefined;
         expect(getNodesNames(itinerary)).deep.equals(['p0', 'p1', 'p3', 'p2']);
+        expect(itinerary.edgesWeights[0]).almost.equals(30.696);
+        expect(itinerary.edgesWeights[1]).almost.equals(15.078);
+        expect(itinerary.edgesWeights[2]).almost.equals(27.005);
+
     });
 });