@wemap/osm 3.1.10 → 3.1.12

package/assets/itinerary-with-duplicate-nodes.json

@@ -0,0 +1,110 @@
+{
+    "code": "Ok",
+    "routes": [
+        {
+            "geometry": {
+                "coordinates": [
+                    [
+                        4.931728,
+                        44.799761
+                    ],
+                    [
+                        4.927543,
+                        44.799052
+                    ],
+                    [
+                        4.927543,
+                        44.799052
+                    ],
+                    [
+                        4.927385,
+                        44.799037
+                    ],
+                    [
+                        4.923283,
+                        44.798721
+                    ]
+                ],
+                "type": "LineString"
+            },
+            "legs": [
+                {
+                    "steps": [
+                        {
+                            "driving_side": "right",
+                            "geometry": {
+                                "coordinates": [
+                                    [
+                                        4.931728,
+                                        44.799761
+                                    ],
+                                    [
+                                        4.927543,
+                                        44.799052
+                                    ],
+                                    [
+                                        4.927543,
+                                        44.799052
+                                    ],
+                                    [
+                                        4.927385,
+                                        44.799037
+                                    ],
+                                    [
+                                        4.923283,
+                                        44.798721
+                                    ]
+                                ],
+                                "type": "LineString"
+                            },
+                            "mode": "walking",
+                            "duration": 496.9,
+                            "maneuver": {
+                                "bearing_after": 264,
+                                "type": "end of road",
+                                "modifier": "left",
+                                "bearing_before": 338,
+                                "location": [
+                                    4.931728,
+                                    44.799761
+                                ]
+                            },
+                            "weight": 496.9,
+                            "distance": 689.7,
+                            "name": "Route d'Ambonil"
+                        },
+                        {
+                            "driving_side": "right",
+                            "geometry": {
+                                "coordinates": [
+                                    [
+                                        4.931728,
+                                        44.799761
+                                    ],
+                                    [
+                                        4.931728,
+                                        44.799761
+                                    ]
+                                ]
+                            },
+                            "maneuver": {
+                                "bearing_after": 0,
+                                "type": "arrive",
+                                "modifier": "left",
+                                "bearing_before": 291,
+                                "location": [
+                                    4.556421,
+                                    44.302754
+                                ]
+                            }
+                        }
+                    ]
+                }
+            ],
+            "distance": 75006.7,
+            "duration": 54016.6,
+            "weight_name": "duration",
+            "weight": 54016.6
+        }
+    ]
+}

package/package.json

@@ -11,7 +11,7 @@
         "directory": "packages/osm"
     },
     "name": "@wemap/osm",
-    "version": "3.1.10",
+    "version": "3.1.12",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -26,11 +26,12 @@
     ],
     "license": "ISC",
     "dependencies": {
-        "@wemap/geo": "^3.1.9",
-        "@wemap/graph": "^3.1.10",
+        "@wemap/geo": "^3.1.11",
+        "@wemap/graph": "^3.1.11",
         "@wemap/logger": "^3.0.0",
+        "@wemap/maths": "^3.1.11",
         "lodash.isnumber": "^3.0.3",
         "sax": "^1.2.4"
     },
-    "gitHead": "2bba01343dd4507adc51cff378450d5369d124ea"
+    "gitHead": "a00b7441f2ee41da9b095f646aa2beaf1acef35f"
 }

package/src/osrm/OsrmUtils.js

@@ -159,6 +159,8 @@ class OsrmUtils {
         itinerary._steps = [];
         itinerary._nextStepsIndexes = [];
 
+        let currentNodeIndex = 0;
+
         for (let i = 0; i < jsonSteps.length; i++) {
             const jsonStep = jsonSteps[i];
 
@@ -181,13 +183,10 @@ class OsrmUtils {
             if (step.lastStep) {
                 coordinates = [coordinates[0]];
             }
-            coordinates.forEach(coords => {
-                const wgs84 = OsrmUtils.jsonToCoordinates(coords);
-                const node = itinerary.getNodeByCoords(wgs84);
-                if (!node) {
-                    throw new Error('Cannot parse these step coordinates, '
-                        + 'they are not found in main itinerary: ' + wgs84.toString());
-                }
+
+            for (const coords of coordinates) {
+
+                const node = itinerary.nodes[currentNodeIndex];
                 step.nodes.push(node);
 
                 const isFirstNode = coordinates[0] === coords;
@@ -204,7 +203,8 @@ class OsrmUtils {
                 }
 
                 previousNode = node;
-            });
+                currentNodeIndex++;
+            }
 
             /**
              * Add common fields
@@ -248,6 +248,8 @@ class OsrmUtils {
             }
 
             itinerary._steps.push(step);
+
+            currentNodeIndex--;
         }
     }
 

package/src/osrm/OsrmUtils.spec.js

@@ -6,6 +6,7 @@ import path from 'path';
 import {
     Level, Coordinates
 } from '@wemap/geo';
+import { Edge } from '@wemap/graph';
 
 import OsmParser from '../model/OsmParser';
 import OsmRouter from '../network/OsmRouter';
@@ -316,15 +317,23 @@ describe('OsrmUtils - createItineraryFromJson', () => {
     it('Errored (Montpellier outdoor)', () => {
 
         const filePath = path.resolve(__dirname,
-            '../../assets/itinerary-montpellier-outdoor-errored.json');
+            '../../assets/itinerary-with-duplicate-nodes.json');
         const fileString = fs.readFileSync(filePath, 'utf8');
 
         const json = JSON.parse(fileString);
 
-        const start = new Coordinates(43.6007871, 3.8757218000000004);
-        const end = new Coordinates(43.598877, 3.873866);
+        const start = new Coordinates(44.810569099999995, 4.9503924999999995);
+        const end = new Coordinates(44.302673, 4.556377);
 
-        expect(() => OsrmUtils.createItineraryFromJson(json, start, end)).throw(Error);
+        const itinerary = OsrmUtils.createItineraryFromJson(json, start, end);
+        itinerary.edges.forEach(edge => {
+            expect(edge).instanceOf(Edge);
+        });
+        itinerary.steps.forEach(step => {
+            step.edges.forEach(edge => {
+                expect(edge).instanceOf(Edge);
+            });
+        });
     });
 
 });

package/assets/itinerary-montpellier-outdoor-errored.json

@@ -1 +0,0 @@
-{"code":"Ok","routes":[{"geometry":{"coordinates":[[3.875607,43.600777],[3.875723,43.600109],[3.875766,43.600086],[3.876247,43.599974],[3.876341,43.599956],[3.876396,43.599881],[3.876234,43.599853],[3.875869,43.599787],[3.875829,43.599781],[3.875671,43.599759],[3.875643,43.599755],[3.875606,43.599749],[3.875578,43.599746],[3.875498,43.599734],[3.87536,43.599707],[3.875169,43.599674],[3.874655,43.599577],[3.874623,43.599063],[3.873865,43.59906]],"type":"LineString"},"legs":[{"steps":[{"intersections":[{"out":0,"entry":[true],"bearings":[173],"location":[3.875607,43.600777]}],"driving_side":"right","geometry":{"coordinates":[[3.875607,43.600777],[3.875723,43.600109],[3.875766,43.600086],[3.876247,43.599974],[3.876341,43.599956],[3.876396,43.599881]],"type":"LineString"},"mode":"walking","duration":98.7,"maneuver":{"bearing_after":173,"type":"depart","modifier":"left","bearing_before":0,"location":[3.875607,43.600777]},"weight":98.7,"distance":137.2,"name":""},{"intersections":[{"out":1,"location":[3.876396,43.599881],"bearings":[75,255,330],"entry":[true,true,false],"in":2},{"out":2,"location":[3.876234,43.599853],"bearings":[75,180,255],"entry":[false,true,true],"in":0},{"out":2,"location":[3.875829,43.599781],"bearings":[75,195,255],"entry":[false,true,true],"in":0},{"out":2,"location":[3.875643,43.599755],"bearings":[75,135,255],"entry":[false,true,true],"in":0},{"out":2,"location":[3.875498,43.599734],"bearings":[75,165,255,345],"entry":[false,true,true,true],"in":0},{"out":2,"location":[3.875169,43.599674],"bearings":[75,180,255],"entry":[false,true,true],"in":0}],"driving_side":"right","geometry":{"coordinates":[[3.876396,43.599881],[3.876234,43.599853],[3.875869,43.599787],[3.875829,43.599781],[3.875671,43.599759],[4.875643,43.599755],[3.875606,43.599749],[3.875578,43.599746],[3.875498,43.599734],[3.87536,43.599707],[3.875169,43.599674],[3.874655,43.599577]],"type":"LineString"},"mode":"walking","duration":103.9,"maneuver":{"bearing_after":255,"type":"turn","modifier":"right","bearing_before":149,"location":[3.876396,43.599881]},"weight":103.9,"distance":144.3,"name":"Boulevard Vieussens"},{"intersections":[{"out":1,"location":[3.874655,43.599577],"bearings":[75,180,255],"entry":[false,true,true],"in":0}],"driving_side":"right","geometry":{"coordinates":[[3.874655,43.599577],[3.874623,43.599063]],"type":"LineString"},"mode":"walking","duration":41.2,"maneuver":{"bearing_after":181,"type":"turn","modifier":"left","bearing_before":254,"location":[3.874655,43.599577]},"weight":41.2,"distance":57.2,"name":"Impasse Bizeray"},{"intersections":[{"out":2,"location":[3.874623,43.599063],"bearings":[0,90,270],"entry":[false,true,true],"in":0}],"driving_side":"right","geometry":{"coordinates":[[3.874623,43.599063],[3.873865,43.59906]],"type":"LineString"},"mode":"walking","duration":44,"maneuver":{"bearing_after":268,"type":"turn","modifier":"right","bearing_before":181,"location":[3.874623,43.599063]},"weight":44,"distance":61.1,"name":"Rue du Docteur Louis Perrier"},{"intersections":[{"in":0,"entry":[true],"bearings":[90],"location":[3.873865,43.59906]}],"driving_side":"right","geometry":{"coordinates":[[3.873865,43.59906],[3.873865,43.59906]],"type":"LineString"},"mode":"walking","duration":0,"maneuver":{"bearing_after":0,"type":"arrive","modifier":"left","bearing_before":270,"location":[3.873865,43.59906]},"weight":0,"distance":0,"name":"Rue du Docteur Louis Perrier"}],"distance":399.7,"duration":287.8,"summary":"Boulevard Vieussens, Boulevard Berthelot","weight":287.8}],"distance":399.7,"duration":287.8,"weight_name":"duration","weight":287.8}],"waypoints":[{"hint":"d89TgaHPU4GmAQAAGwIAAB0AAADAAQAApgEAABsCAAAdAAAAwAEAAAIAAAAXIzsAiUuZAoojOwCTS5kCAQDPCg61bn8=","name":"","location":[3.875607,43.600777]},{"hint":"dNRTgZbUU4FHAAAAuAEAAIMAAAAAAAAARwAAALgBAACDAAAAAAAAAAIAAABJHDsA1ESZAkocOwAdRJkCAwCfBQ61bn8=","name":"Rue du Docteur Louis Perrier","location":[3.873865,43.59906]}]}