@wemap/routers 12.0.0 → 12.2.0

package/assets/components.osm

@@ -0,0 +1,146 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6' generator='JOSM'>
+  <node id='-161218670596205' action='modify' visible='true' lat='45.19343691244' lon='5.71669745344' />
+  <node id='-161218670596206' action='modify' visible='true' lat='45.193278084' lon='5.71670229287' />
+  <node id='-161218670596207' action='modify' visible='true' lat='45.19328319976' lon='5.71704036911' />
+  <node id='-161218670596208' action='modify' visible='true' lat='45.19344202819' lon='5.71703552968' />
+  <node id='-161218670596209' action='modify' visible='true' lat='45.19339744873' lon='5.71676589717'>
+    <tag k='name' v='p1' />
+  </node>
+  <node id='-161218670596210' action='modify' visible='true' lat='45.19339817953' lon='5.71679735347'>
+    <tag k='name' v='p2' />
+  </node>
+  <node id='-161218670596211' action='modify' visible='true' lat='45.19337869139' lon='5.71679873616'>
+    <tag k='name' v='p3' />
+  </node>
+  <node id='-161218670596212' action='modify' visible='true' lat='45.19337747338' lon='5.71675656398'>
+    <tag k='name' v='p4' />
+  </node>
+  <node id='-161218670596215' action='modify' visible='true' lat='45.19340061555' lon='5.71685646366'>
+    <tag k='name' v='p21' />
+  </node>
+  <node id='-161218670596216' action='modify' visible='true' lat='45.19340232076' lon='5.71692594406'>
+    <tag k='name' v='p22' />
+  </node>
+  <node id='-161218670596217' action='modify' visible='true' lat='45.19336456249' lon='5.7169345859'>
+    <tag k='name' v='p31' />
+  </node>
+  <node id='-161218670596218' action='modify' visible='true' lat='45.19332436816' lon='5.71693562293'>
+    <tag k='highway' v='elevator' />
+    <tag k='name' v='p32' />
+  </node>
+  <node id='-161218670596219' action='modify' visible='true' lat='45.19332315015' lon='5.71686372281'>
+    <tag k='name' v='p33' />
+  </node>
+  <node id='-161218670596220' action='modify' visible='true' lat='45.19329367429' lon='5.71686441416'>
+    <tag k='name' v='p34' />
+  </node>
+  <node id='-161218670596221' action='modify' visible='true' lat='45.19334458713' lon='5.71673374952'>
+    <tag k='name' v='p11' />
+  </node>
+  <node id='-161218670596222' action='modify' visible='true' lat='45.19334531793' lon='5.71679355106'>
+    <tag k='name' v='p12' />
+  </node>
+  <node id='-161218670596223' action='modify' visible='true' lat='45.19331364967' lon='5.71679493375'>
+    <tag k='name' v='p13' />
+  </node>
+  <node id='-161218670596224' action='modify' visible='true' lat='45.19331145725' lon='5.71674342838'>
+    <tag k='name' v='p14' />
+  </node>
+  <node id='-161218670596225' action='modify' visible='true' lat='45.19340037195' lon='5.71697122731'>
+    <tag k='name' v='p41' />
+  </node>
+  <node id='-161218670596226' action='modify' visible='true' lat='45.19340158996' lon='5.71701478219'>
+    <tag k='name' v='p42' />
+  </node>
+  <node id='-161218670596227' action='modify' visible='true' lat='45.19337747338' lon='5.71701581921'>
+    <tag k='name' v='p43' />
+  </node>
+  <node id='-161218670596228' action='modify' visible='true' lat='45.19337771699' lon='5.71697295568'>
+    <tag k='name' v='p44' />
+  </node>
+  <node id='-161218670596230' action='modify' visible='true' lat='45.19334848476' lon='5.71697986915'>
+    <tag k='name' v='p48' />
+  </node>
+  <node id='-161218670596231' action='modify' visible='true' lat='45.19332241934' lon='5.7169805605'>
+    <tag k='name' v='p47' />
+  </node>
+  <node id='-161218670596232' action='modify' visible='true' lat='45.19332363736' lon='5.71702307836'>
+    <tag k='name' v='p46' />
+  </node>
+  <node id='-161218670596233' action='modify' visible='true' lat='45.19334945917' lon='5.71702065864'>
+    <tag k='name' v='p45' />
+  </node>
+  <way id='-921430905467925' action='modify' visible='true'>
+    <nd ref='-161218670596205' />
+    <nd ref='-161218670596206' />
+    <nd ref='-161218670596207' />
+    <nd ref='-161218670596208' />
+    <nd ref='-161218670596205' />
+    <tag k='wemap:routing-bounds' v='yes' />
+  </way>
+  <way id='-921430905467948' action='modify' visible='true'>
+    <nd ref='-161218670596209' />
+    <nd ref='-161218670596210' />
+    <nd ref='-161218670596211' />
+    <tag k='highway' v='footway' />
+  </way>
+  <way id='-921430905467953' action='modify' visible='true'>
+    <nd ref='-161218670596215' />
+    <nd ref='-161218670596216' />
+    <tag k='highway' v='footway' />
+  </way>
+  <way id='-921430905467954' action='modify' visible='true'>
+    <nd ref='-161218670596218' />
+    <nd ref='-161218670596219' />
+    <nd ref='-161218670596220' />
+    <tag k='highway' v='footway' />
+    <tag k='level' v='0' />
+  </way>
+  <way id='-921430905467957' action='modify' visible='true'>
+    <nd ref='-161218670596217' />
+    <nd ref='-161218670596218' />
+    <tag k='highway' v='footway' />
+    <tag k='level' v='1' />
+  </way>
+  <way id='-921430905467960' action='modify' visible='true'>
+    <nd ref='-161218670596221' />
+    <nd ref='-161218670596222' />
+    <nd ref='-161218670596223' />
+    <tag k='highway' v='footway' />
+    <tag k='level' v='0' />
+  </way>
+  <way id='-921430905467963' action='modify' visible='true'>
+    <nd ref='-161218670596225' />
+    <nd ref='-161218670596226' />
+    <nd ref='-161218670596227' />
+    <nd ref='-161218670596228' />
+    <nd ref='-161218670596225' />
+    <tag k='highway' v='footway' />
+  </way>
+  <way id='-921430905467967' action='modify' visible='true'>
+    <nd ref='-161218670596230' />
+    <nd ref='-161218670596231' />
+    <nd ref='-161218670596232' />
+    <nd ref='-161218670596233' />
+    <nd ref='-161218670596230' />
+    <tag k='highway' v='footway' />
+  </way>
+  <way id='-921430905467985' action='modify' visible='true'>
+    <nd ref='-161218670596233' />
+    <nd ref='-161218670596227' />
+    <tag k='highway' v='footway' />
+    <tag k='oneway' v='yes' />
+  </way>
+  <way id='-921430905468123' action='modify' visible='true'>
+    <nd ref='-161218670596223' />
+    <nd ref='-161218670596224' />
+    <tag k='highway' v='footway' />
+    <tag k='level' v='1' />
+  </way>
+  <way id='-921430905468128' action='modify' visible='true'>
+    <nd ref='-161218670596211' />
+    <nd ref='-161218670596212' />
+    <tag k='highway' v='footway' />
+  </way>
+</osm>

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
       ]
     };
   }
@@ -1126,6 +1129,36 @@ class GraphRouterEngine {
   calculateShortestPathByVertex(source, target, options = GraphRouterOptionsBuilder.DEFAULT, inputVertices = this.graph.vertices, inputEdges = this.graph.edges) {
     return this.calculateShortestPathToMultipleDestinationsByVertex(source, [target], options, inputVertices, inputEdges);
   }
+  // https://en.wikipedia.org/wiki/Component_(graph_theory)
+  calculateComponents() {
+    function shiftSet(set) {
+      const firstValue = set.values().next().value;
+      set.delete(firstValue);
+      return firstValue;
+    }
+    const verticesToTest = new Set(this.graph.vertices);
+    let components = [];
+    while (verticesToTest.size > 0) {
+      const vertexToTest = shiftSet(verticesToTest);
+      const otherVertices = this.graph.vertices.filter((v) => v.id !== vertexToTest.id);
+      const result = this.calculateShortestPathToMultipleDestinationsByVertex(vertexToTest, otherVertices);
+      const reachedVertices = otherVertices.filter((ov) => result.weightedDistance(ov) !== null);
+      components.push([vertexToTest, ...reachedVertices]);
+      reachedVertices.forEach((rv) => verticesToTest.delete(rv));
+    }
+    for (let i = 0; i < components.length - 1; i++) {
+      const component1 = components[i];
+      for (let j = i + 1; j < components.length; j++) {
+        const component2 = components[j];
+        const componentsIntersect = component2.some((v) => component1.includes(v));
+        if (componentsIntersect) {
+          component1.push(...component2);
+          components = components.filter((component) => component !== component2);
+        }
+      }
+    }
+    return components.map((c) => [...new Set(c)]);
+  }
 }
 class GraphRouterResults extends GraphRouterEngineResults {
   constructor(engineResults, sourceProjection, targetsProjections) {
@@ -1205,12 +1238,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 +1369,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 +1378,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 +1452,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 +2821,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) {