@wemap/routers 12.5.0 → 12.7.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

@@ -75,10 +75,19 @@ class Vertex {
     return this.coords.bearingTo(other.coords);
   }
   toJson() {
-    return this.coords.toCompressedJson();
+    return {
+      id: this.id,
+      coords: this.coords.toCompressedJson(),
+      ...Object.keys(this.properties).length > 0 && { properties: this.properties }
+    };
   }
   static fromJson(json) {
-    return new Vertex(geo.Coordinates.fromCompressedJson(json));
+    const v = new Vertex(
+      geo.Coordinates.fromCompressedJson(json.coords),
+      json.properties
+    );
+    v.id = json.id;
+    return v;
   }
 }
 class Graph {
@@ -179,9 +188,30 @@ class Graph {
     });
     return bestProjection;
   }
-  toCompressedJson() {
+  toJson() {
     return {
       vertices: this.vertices.map((vertex) => vertex.toJson()),
+      edges: this.edges.map((edge) => ({
+        id: edge.id,
+        vertex1Idx: this.vertices.indexOf(edge.vertex1),
+        vertex2Idx: this.vertices.indexOf(edge.vertex2),
+        ...Object.keys(edge.properties).length > 0 && { properties: edge.properties }
+      }))
+    };
+  }
+  static fromJson(json) {
+    const vertices = json.vertices.map((vertex) => Vertex.fromJson(vertex));
+    const edges = json.edges.map((jsonEdge) => new Edge(
+      vertices[jsonEdge.vertex1Idx],
+      vertices[jsonEdge.vertex2Idx],
+      jsonEdge.properties
+    ));
+    return new Graph(vertices, edges);
+  }
+  /** @deprecated */
+  toCompressedJson() {
+    return {
+      vertices: this.vertices.map((vertex) => vertex.coords.toCompressedJson()),
       verticesIds: this.vertices.map((vertex) => vertex.id),
       edges: this.edges.map((edge) => {
         const vertex1Idx = this.vertices.indexOf(edge.vertex1);
@@ -194,8 +224,9 @@ class Graph {
       })
     };
   }
+  /** @deprecated */
   static fromCompressedJson(json) {
-    const vertices = json.vertices.map((vertex) => Vertex.fromJson(vertex));
+    const vertices = json.vertices.map((vertex) => new Vertex(geo.Coordinates.fromCompressedJson(vertex)));
     const edges = json.edges.map((jsonEdge) => new Edge(
       vertices[jsonEdge[0]],
       vertices[jsonEdge[1]],
@@ -429,9 +460,6 @@ class StepsBuilder {
             ...levelChangeType && { type: levelChangeType }
           };
         }
-        if (currentStep && currentStep.duration === 0) {
-          delete currentStep.duration;
-        }
         currentStep = {
           coords: currentCoords,
           ...stepName && { name: stepName },
@@ -443,9 +471,7 @@ class StepsBuilder {
         stepsInfo.push(currentStep);
       }
       currentStep.distance += currentCoords.distanceTo(nextCoords);
-      if (duration) {
-        currentStep.duration += duration;
-      }
+      currentStep.duration += duration;
       previousBearing = nextBearing;
     }
     const lastCoords = graphRoute.vertices[graphRoute.vertices.length - 1].coords;
@@ -2271,6 +2297,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;
     };
@@ -2746,7 +2776,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;
       }