@wemap/routers 12.8.7 → 12.8.9

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "12.8.7",
+    "version": "12.8.9",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -34,10 +34,10 @@
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
         "@types/mapbox__polyline": "^1.0.2",
-        "@wemap/geo": "^12.8.5",
+        "@wemap/geo": "^12.8.9",
         "@wemap/logger": "^12.0.0",
         "@wemap/maths": "^12.0.0",
-        "@wemap/osm": "^12.8.5",
+        "@wemap/osm": "^12.8.9",
         "@wemap/salesman.js": "^2.1.0"
     },
     "devDependencies": {
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "46a066c3198633332b721adc3b98523ab7940939"
+    "gitHead": "653f93f7efb8585735ea406aac1ca96f89b4ee12"
 }

package/src/model/StepsBuilder.ts

@@ -98,7 +98,7 @@ export default class StepsBuilder {
                 previousEdgeProperties.incline && previousEdgeProperties.areStairs
                 && (!incline || !areStairs)
             );
-            const createNewStep = vertex.properties.isSubwayEntrance;
+            const isEntrance = vertex.properties.isSubwayEntrance;
 
             const stepName = edge.properties.name || null;
             const duration = graphRoute.edgesWeights[i];
@@ -117,7 +117,7 @@ export default class StepsBuilder {
             const splitByEndOfLevelChange = previousStep?.levelChange && !Level.isRange(currentCoords.level)
                 || forceEndOfLevelChange;
 
-            const splitStepCondition = splitByAngle || splitByLevel || splitByEndOfLevelChange || createNewStep;
+            const splitStepCondition = splitByAngle || splitByLevel || splitByEndOfLevelChange || isEntrance;
 
             // New step creation
             if (isFirstStep || splitStepCondition) {

package/src/wemap-multi/CustomGraphMap.ts

@@ -13,7 +13,7 @@ import OsmGraphUtils from '../wemap-osm/OsmGraphUtils.js';
 
 
 export type ParsingErrors = {
-    couldNotParseFile: boolean,
+    couldNotParseFile?: string,
     routingIoNotFound: OsmNode[],
     routingBoundsNotFound: boolean
 }
@@ -66,7 +66,6 @@ export default class CustomGraphMap {
         callbackErrors?: (errors: ParsingErrors) => void
     ) {
         const errors: ParsingErrors = {
-            couldNotParseFile: false,
             routingIoNotFound: [],
             routingBoundsNotFound: false
         };
@@ -75,7 +74,7 @@ export default class CustomGraphMap {
         try {
             osmModel = OsmParser.parseOsmXmlString(osmXmlString);
         } catch (e) {
-            errors.couldNotParseFile = true;
+            errors.couldNotParseFile = e instanceof Error ? e.message : "Unknown error";
             callbackErrors?.(errors);
             return;
         }

package/src/wemap-multi/CustomGraphMapTester.ts

@@ -15,7 +15,8 @@ export type Error = CouldNotParseFileError
     | RoutingIoNotOnGraphError;
 
 export type CouldNotParseFileError = {
-    type: 'could-not-parse-file'
+    type: 'could-not-parse-file',
+    details: string | undefined
 }
 
 export type MultipleGraphComponentsError = {
@@ -42,7 +43,8 @@ export default class CustomGraphMapTester {
 
         if (customGraphMapErrors?.couldNotParseFile || !customGraphMap) {
             errors.push({
-                type: 'could-not-parse-file'
+                type: 'could-not-parse-file',
+                details: customGraphMapErrors?.couldNotParseFile
             });
             return { errors };
         }

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

@@ -136,4 +136,18 @@ describe('OsmGraph - complex', () => {
 
     });
 
-});
+    it('escalators', () => {
+
+        const osmXmlString = loadFile('network-escalators.osm');
+        const osmModel = OsmParser.parseOsmXmlString(osmXmlString);
+        const graph = OsmGraphUtils.createGraphFromOsmModel(osmModel);
+
+        verifyCoherence(graph);
+
+        expect(graph.vertices.length).equals(4);
+        expect(graph.edges.length).equals(3);
+        graph.vertices.forEach(v => expect(v.coords.level).be.a("number"));
+
+    });
+
+});

package/src/wemap-osm/OsmGraphUtils.ts

@@ -72,7 +72,10 @@ export default class OsmGraphUtils {
             if (vertex) {
                 // In the case where vertices are linked to edges with level change
                 if (!Level.equals(vertex.coords.level, nodeLevel)) {
-                    vertex.coords.level = Level.intersection(vertex.coords.level, nodeLevel) || nodeLevel;
+                    vertex.coords.level = Level.intersection(vertex.coords.level, nodeLevel);
+                    if (vertex.coords.level === null) {
+                        vertex.coords.level = nodeLevel;
+                    }
                 }
                 return vertex;
             }