@wemap/routers 12.6.0 → 12.7.0

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;