@wemap/routers 12.4.0 → 12.6.0

package/assets/stairs-and-exit.osm

@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' generator='JOSM'>
+  <node id='-1610618489058234' action='modify' visible='true' lat='48.87601173273' lon='2.32555037119'>
+    <tag k='name' v='p1' />
+  </node>
+  <node id='-1610618489058235' action='modify' visible='true' lat='48.87597991746' lon='2.3253223214'>
+    <tag k='name' v='p2' />
+  </node>
+  <node id='-1610618489058236' action='modify' visible='true' lat='48.87573599972' lon='2.32538912386'>
+    <tag k='name' v='p3' />
+  </node>
+  <node id='-1610618489058237' action='modify' visible='true' lat='48.87575872503' lon='2.32561026305'>
+    <tag k='name' v='p4' />
+  </node>
+  <node id='-1610618489058238' action='modify' visible='true' lat='48.87619959391' lon='2.32495145256' />
+  <node id='-1610618489058239' action='modify' visible='true' lat='48.87625261911' lon='2.32559874539' />
+  <node id='-1610618489058240' action='modify' visible='true' lat='48.87542996461' lon='2.32583140224' />
+  <node id='-1610618489058241' action='modify' visible='true' lat='48.87539057382' lon='2.32522557301' />
+  <way id='-921430905799056' action='modify' visible='true'>
+    <nd ref='-1610618489058234' />
+    <nd ref='-1610618489058235' />
+    <tag k='highway' v='steps' />
+    <tag k='level' v='0;1' />
+    <tag k='name' v='e1' />
+  </way>
+  <way id='-921430905799057' action='modify' visible='true'>
+    <nd ref='-1610618489058236' />
+    <nd ref='-1610618489058237' />
+    <tag k='highway' v='footway' />
+    <tag k='name' v='e3' />
+  </way>
+  <way id='-921430905799058' action='modify' visible='true'>
+    <nd ref='-1610618489058238' />
+    <nd ref='-1610618489058239' />
+    <nd ref='-1610618489058240' />
+    <nd ref='-1610618489058241' />
+    <nd ref='-1610618489058238' />
+    <tag k='wemap:routing-bounds' v='yes' />
+  </way>
+  <way id='-921430905799059' action='modify' visible='true'>
+    <nd ref='-1610618489058235' />
+    <nd ref='-1610618489058236' />
+    <tag k='highway' v='footway' />
+    <tag k='level' v='0' />
+    <tag k='name' v='e2' />
+  </way>
+</osm>

package/dist/index.js

@@ -2271,6 +2271,10 @@ const _GraphRouterOptionsBuilder = class _GraphRouterOptionsBuilder {
       let duration = getDurationFromLength(edge.length, 4);
       if (edge.properties.areStairs) {
         duration *= 3;
+      } else if (edge.properties.areEscalators) {
+        duration *= 1.5;
+      } else if (edge.properties.isMovingWalkway) {
+        duration *= 0.8;
       }
       return duration;
     };
@@ -2621,7 +2625,7 @@ class GraphRouter extends GraphRouterEngine {
         const distVertexAVertex1 = vertexA.distanceTo(edge.vertex1);
         for (let j = i + 1; j < vertices.length; j++) {
           const vertexB = vertices[j];
-          const distVertexBVertex1 = vertexA.distanceTo(edge.vertex1);
+          const distVertexBVertex1 = vertexB.distanceTo(edge.vertex1);
           const reverse = distVertexBVertex1 < distVertexAVertex1;
           const newEdge = !reverse ? new Edge(vertexA, vertexB, newEdgesOptions) : new Edge(vertexB, vertexA, newEdgesOptions);
           createdEdges.add(newEdge);
@@ -2746,7 +2750,7 @@ const _OsmGraphUtils = class _OsmGraphUtils {
       })) == null ? void 0 : _a[1]) || null;
       if (vertex) {
         if (!geo.Level.equals(vertex.coords.level, nodeLevel)) {
-          vertex.coords.level = geo.Level.intersection(vertex.coords.level, nodeLevel);
+          vertex.coords.level = geo.Level.intersection(vertex.coords.level, nodeLevel) || nodeLevel;
         }
         return vertex;
       }
@@ -3871,11 +3875,11 @@ class WemapMultiRouter {
   get rname() {
     return "wemap-multi";
   }
-  addIOMap(customNetworkMap) {
-    this.maps.push(customNetworkMap);
+  addIOMap(customGraphMap) {
+    this.maps.push(customGraphMap);
   }
-  removeIOMap(customNetworkMap) {
-    this.maps = this.maps.filter((map) => map !== customNetworkMap);
+  removeIOMap(customGraphMap) {
+    this.maps = this.maps.filter((map) => map !== customGraphMap);
   }
   removeAllMaps() {
     this.maps = [];
@@ -4025,7 +4029,7 @@ class WemapMultiRouter {
     throw new Error("Should never happen");
   }
 }
-class CustomNetworkMap {
+class CustomGraphMap {
   constructor(graph, entryPoints, bounds = null, name = null) {
     __publicField(this, "name");
     __publicField(this, "graph");
@@ -4102,7 +4106,7 @@ class CustomNetworkMap {
       errors.routingBoundsNotFound = true;
     }
     callbackErrors == null ? void 0 : callbackErrors(errors);
-    return new CustomNetworkMap(graph, entryPoints, bounds, name);
+    return new CustomGraphMap(graph, entryPoints, bounds, name);
   }
   isPointInside(coordinates) {
     return pointInPolygon([coordinates.lng, coordinates.lat], this.bounds);
@@ -4178,42 +4182,42 @@ class CustomNetworkMap {
     return this.router.calculateShortestPathToMultipleDestinations(start, ends, options);
   }
 }
-class CustomNetworkMapTester {
+class CustomGraphMapTester {
   static createReport(osmXmlString) {
     var _a;
-    let customNetworkMapErrors;
-    const networkMap = CustomNetworkMap.fromOsmXml(osmXmlString, null, (e) => customNetworkMapErrors = e);
+    let customGraphMapErrors;
+    const customGraphMap = CustomGraphMap.fromOsmXml(osmXmlString, null, (e) => customGraphMapErrors = e);
     const errors = [];
-    if ((customNetworkMapErrors == null ? void 0 : customNetworkMapErrors.couldNotParseFile) || !networkMap) {
+    if ((customGraphMapErrors == null ? void 0 : customGraphMapErrors.couldNotParseFile) || !customGraphMap) {
       errors.push({
         type: "could-not-parse-file"
       });
       return { errors };
     }
-    const components = networkMap.router.calculateComponents();
+    const components = customGraphMap.router.calculateComponents();
     if (components.length > 1) {
       errors.push({
         type: "multiple-graph-components",
         data: components
       });
     }
-    if (customNetworkMapErrors == null ? void 0 : customNetworkMapErrors.routingBoundsNotFound) {
+    if (customGraphMapErrors == null ? void 0 : customGraphMapErrors.routingBoundsNotFound) {
       errors.push({
         type: "routing-bounds-not-found"
       });
     }
-    if ((_a = customNetworkMapErrors == null ? void 0 : customNetworkMapErrors.routingIoNotFound) == null ? void 0 : _a.length) {
+    if ((_a = customGraphMapErrors == null ? void 0 : customGraphMapErrors.routingIoNotFound) == null ? void 0 : _a.length) {
       errors.push({
         type: "routing-io-not-on-graph",
-        data: customNetworkMapErrors.routingIoNotFound
+        data: customGraphMapErrors.routingIoNotFound
       });
     }
-    return { graph: networkMap.graph, errors };
+    return { customGraphMap, errors };
   }
   static reportToJson(report) {
-    var _a;
+    var _a, _b;
     return {
-      graph: (_a = report.graph) == null ? void 0 : _a.toCompressedJson(),
+      graph: (_b = (_a = report.customGraphMap) == null ? void 0 : _a.graph) == null ? void 0 : _b.toCompressedJson(),
       errors: report.errors.map((error) => {
         if (error.type === "multiple-graph-components") {
           return { type: error.type, data: error.data.map((c) => c.map((v) => v.id)) };
@@ -4326,8 +4330,8 @@ class ItineraryInfoManager {
   }
 }
 exports.CitywayRemoteRouter = CitywayRemoteRouter$1;
-exports.CustomNetworkMap = CustomNetworkMap;
-exports.CustomNetworkMapTester = CustomNetworkMapTester;
+exports.CustomGraphMap = CustomGraphMap;
+exports.CustomGraphMapTester = CustomGraphMapTester;
 exports.DeutscheBahnRemoteRouter = DeutscheBahnRemoteRouter$1;
 exports.Edge = Edge;
 exports.Graph = Graph;