@wemap/routers 12.0.0 → 12.1.0

package/dist/index.js

@@ -182,6 +182,7 @@ class Graph {
   toCompressedJson() {
     return {
       vertices: this.vertices.map((vertex) => vertex.toJson()),
+      verticesIds: this.vertices.map((vertex) => vertex.id),
       edges: this.edges.map((edge) => {
         const vertex1Idx = this.vertices.indexOf(edge.vertex1);
         const vertex2Idx = this.vertices.indexOf(edge.vertex2);
@@ -195,13 +196,11 @@ class Graph {
   }
   static fromCompressedJson(json) {
     const vertices = json.vertices.map((vertex) => Vertex.fromJson(vertex));
-    const edges = json.edges.map(
-      (jsonEdge) => new Edge(
-        vertices[jsonEdge[0]],
-        vertices[jsonEdge[1]],
-        jsonEdge.length > 2 ? jsonEdge[2] : {}
-      )
-    );
+    const edges = json.edges.map((jsonEdge) => new Edge(
+      vertices[jsonEdge[0]],
+      vertices[jsonEdge[1]],
+      jsonEdge.length > 2 ? jsonEdge[2] : {}
+    ));
     return new Graph(vertices, edges);
   }
   static fromCoordinatesSegments(segments) {
@@ -842,33 +841,37 @@ class Itinerary {
     }
   }
   toGeoJson() {
-    const transformToPoint = (point, name) => ({
+    const transformToPoint = (point, name, type) => ({
       type: "Feature",
-      properties: { name, level: point.level },
+      properties: { name, level: point.level, ...type && { type } },
       geometry: {
         type: "Point",
         coordinates: [point.lng, point.lat]
       }
     });
-    const transformToMultiLineStrings = (segments, level) => {
-      return {
-        type: "Feature",
-        properties: { level, name: level == null ? void 0 : level.toString() },
-        geometry: {
-          type: "MultiLineString",
-          coordinates: segments.map((s) => s.map(({ lat, lng }) => [lng, lat]))
-        }
-      };
-    };
+    const transformToMultiLineStrings = (segments, level) => ({
+      type: "Feature",
+      properties: { level, name: level == null ? void 0 : level.toString() },
+      geometry: {
+        type: "MultiLineString",
+        coordinates: segments.map((s) => s.map(({ lat, lng }) => [lng, lat]))
+      }
+    });
     const levelsOfItinerary = [...new Set(this.coords.map((c) => geo.Level.toString(c.level)))].map(geo.Level.fromString);
     const segmentsSplitted = levelsOfItinerary.map((loi) => [loi, geo.Utils.createSegmentsAtLevel(this.coords, loi, true)]);
     const multiLineStrings = segmentsSplitted.map(([loi, segments]) => transformToMultiLineStrings(segments, loi));
+    const legsStarts = this.legs.map((leg, idx) => transformToPoint(leg.start.coords, `Leg ${idx} start`, "leg-start"));
+    const legsEnds = this.legs.map((leg, idx) => transformToPoint(leg.end.coords, `Leg ${idx} end`, "leg-end"));
+    const steps = this.steps.map((step) => transformToPoint(step.coords, `Step ${step.number}`, "step"));
     return {
       type: "FeatureCollection",
       features: [
-        transformToPoint(this.origin, "origin"),
-        transformToPoint(this.destination, "destination"),
-        ...multiLineStrings
+        transformToPoint(this.origin, "origin", "origin"),
+        transformToPoint(this.destination, "destination", "destination"),
+        ...multiLineStrings,
+        ...legsStarts,
+        ...legsEnds,
+        ...steps
       ]
     };
   }
@@ -1205,12 +1208,14 @@ class GraphRouter extends GraphRouterEngine {
       if (projection.nearestElement instanceof Edge) {
         const edge = projection.nearestElement;
         const newVertex = new Vertex(projection.coords, {
-          name: `proj on ${edge.properties.name || null} (tmp)`
+          name: `proj on ${edge.properties.name || null} (tmp)`,
+          ...typeof edge.properties.externalId !== "undefined" && { externalId: edge.properties.externalId }
         });
         newVertex.id = this.graph.vertices.length + createdVertices.size;
         const newEdgesOptions = {
           ...edge.properties,
-          name: `splitted ${edge.properties.name || null} (tmp)`
+          name: `splitted ${edge.properties.name || null} (tmp)`,
+          ...typeof edge.properties.externalId !== "undefined" && { externalId: edge.properties.externalId }
         };
         const newEdge1 = new Edge(edge.vertex1, newVertex, newEdgesOptions);
         const newEdge2 = new Edge(newVertex, edge.vertex2, newEdgesOptions);
@@ -1334,6 +1339,7 @@ const _OsmGraphUtils = class _OsmGraphUtils {
   static parseNodeProperties(osmNode) {
     return {
       ...osmNode.name && { name: osmNode.name },
+      ...osmNode.id && { externalId: osmNode.id },
       ...osmNode.isGate && { isGate: osmNode.isGate },
       ...osmNode.isSubwayEntrance && { isSubwayEntrance: osmNode.isSubwayEntrance },
       ...osmNode.subwayEntranceRef && { subwayEntrsanceRef: osmNode.subwayEntranceRef }
@@ -1342,6 +1348,7 @@ const _OsmGraphUtils = class _OsmGraphUtils {
   static parseWayProperties(osmWay) {
     return {
       ...osmWay.name && { name: osmWay.name },
+      ...osmWay.id && { externalId: osmWay.id },
       ...osmWay.isOneway && { isOneway: osmWay.isOneway },
       ...osmWay.areStairs && { areStairs: osmWay.areStairs },
       ...osmWay.isElevator && { isElevator: osmWay.isElevator },
@@ -1415,11 +1422,11 @@ const _OsmGraphUtils = class _OsmGraphUtils {
       const elevatorCenterFakeOsmNode = new osm.OsmNode(fakeOsmNodeId--, elevatorCenterCoords, { highway: "elevator" });
       entryVertices.forEach((entryVertex) => {
         const vertexCenter = getOrCreateVertex(elevatorCenterFakeOsmNode, entryVertex.coords.level);
-        edges.push(new Edge(vertexCenter, entryVertex));
+        edges.push(new Edge(vertexCenter, entryVertex, { externalId: way.id }));
       });
     });
-    elevatorVertices.forEach(([, name, verticesOfEachLevel]) => {
-      const elevatorEdgeProps = { name, isElevator: true };
+    elevatorVertices.forEach(([id, name, verticesOfEachLevel]) => {
+      const elevatorEdgeProps = { name, isElevator: true, externalId: id };
       for (let i = 0; i < verticesOfEachLevel.length; i++) {
         for (let j = i + 1; j < verticesOfEachLevel.length; j++) {
           edges.push(new Edge(verticesOfEachLevel[i], verticesOfEachLevel[j], elevatorEdgeProps));
@@ -2784,17 +2791,6 @@ class CustomNetworkMap {
   getRoutesMultipleDestinationsInsideMap(start, ends, options) {
     return this.router.calculateShortestPathToMultipleDestinations(start, ends, options);
   }
-  get disabledEdges() {
-    return this.router.disabledEdges;
-  }
-  enableEdge(edgeId) {
-    const edge = this.graph.edges.find((e) => e.id === edgeId);
-    return Boolean(edge && this.router.disabledEdges.delete(edge));
-  }
-  disableEdge(edgeId) {
-    const edge = this.graph.edges.find((e) => e.id === edgeId);
-    return Boolean(edge && this.router.disabledEdges.add(edge));
-  }
 }
 class ItineraryInfoManager {
   constructor(itinerary = null) {