@wemap/routers 12.0.0-alpha.9 → 12.0.0

package/assets/rr-wemap-multi-remote-indoor-indoor.json

@@ -23,10 +23,10 @@
             },
             "distance": 13.06248469300833,
             "duration": 9.404988978965996,
-            "mode": "WALK",
+            "transitMode": "WALK",
             "legs": [
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.8725992,

package/assets/rr-wemap-multi-remote-indoor-outdoor-indoor.json

@@ -26,10 +26,10 @@
             },
             "distance": 1623.567209158486,
             "duration": 1188.9963905941102,
-            "mode": "WALK",
+            "transitMode": "WALK",
             "legs": [
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.8725992,
@@ -93,7 +93,7 @@
                     ]
                 },
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.872668,
@@ -548,7 +548,7 @@
                     ]
                 },
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.8774156,

package/assets/rr-wemap-multi-remote-indoor-outdoor.json

@@ -24,10 +24,10 @@
             },
             "distance": 24.658068219028713,
             "duration": 17.641809117700674,
-            "mode": "WALK",
+            "transitMode": "WALK",
             "legs": [
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.8725992,
@@ -91,7 +91,7 @@
                     ]
                 },
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.872668,

package/assets/rr-wemap-multi-remote-outdoor-indoor.json

@@ -24,10 +24,10 @@
             },
             "distance": 18.278520725857963,
             "duration": 13.108534922617736,
-            "mode": "WALK",
+            "transitMode": "WALK",
             "legs": [
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.872645,
@@ -85,7 +85,7 @@
                     ]
                 },
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.87262168252,

package/assets/rr-wemap-multi-remote-outdoor-outdoor.json

@@ -20,10 +20,10 @@
             },
             "distance": 29.8,
             "duration": 23.5,
-            "mode": "WALK",
+            "transitMode": "WALK",
             "legs": [
                 {
-                    "mode": "WALK",
+                    "transitMode": "WALK",
                     "start": {
                         "coords": [
                             48.872645,

package/dist/index.js

@@ -14,6 +14,15 @@ const osm = require("@wemap/osm");
 const Polyline = require("@mapbox/polyline");
 const pointInPolygon = require("@turf/boolean-point-in-polygon");
 const convexHullFn = require("@turf/convex");
+function routerRequestToJson(routerRequest) {
+  const { origin, destination, waypoints, ...rest } = routerRequest;
+  return {
+    origin: origin.toJson(),
+    destination: destination.toJson(),
+    ...waypoints && { waypoints: waypoints.map((w) => w.toJson()) },
+    ...rest
+  };
+}
 const _Edge = class _Edge {
   constructor(vertex1, vertex2, properties = {}) {
     __publicField(this, "id", _Edge.currentUniqueId++);
@@ -510,7 +519,7 @@ class Leg {
     start,
     end,
     coords,
-    mode,
+    transitMode,
     duration,
     startTime,
     endTime,
@@ -521,7 +530,7 @@ class Leg {
     __publicField(this, "end");
     __publicField(this, "coords");
     __publicField(this, "distance");
-    __publicField(this, "mode");
+    __publicField(this, "transitMode");
     __publicField(this, "duration");
     __publicField(this, "startTime");
     __publicField(this, "endTime");
@@ -536,7 +545,7 @@ class Leg {
       coords: end.coords
     };
     this.coords = coords;
-    this.mode = mode;
+    this.transitMode = transitMode;
     this.distance = geo.Utils.calcDistance(coords);
     this.duration = typeof duration === "number" ? duration : getDurationFromLength(this.distance);
     this.startTime = typeof startTime === "number" ? startTime : null;
@@ -545,14 +554,14 @@ class Leg {
     this.steps = Array.isArray(steps) ? steps : new StepsBuilder().setStart(start.coords).setEnd(end.coords).setPathCoords(coords).build();
   }
   isPublicTransport() {
-    return isTransitModePublicTransport(this.mode);
+    return isTransitModePublicTransport(this.transitMode);
   }
   toGraph() {
     return Graph.fromCoordinatesSegments([this.coords]);
   }
   static equals(obj1, obj2) {
     var _a, _b;
-    const intermediate = obj1.mode === obj2.mode && Math.abs(obj1.duration - obj2.duration) <= 0.05 && obj1.startTime === obj2.startTime && obj1.endTime === obj2.endTime && obj1.start.name === obj2.start.name && obj1.start.coords.equals(obj2.start.coords) && obj1.end.name === obj2.end.name && obj1.end.coords.equals(obj2.end.coords) && obj1.coords.length === obj2.coords.length && (obj1.steps === obj2.steps || ((_a = obj1.steps) == null ? void 0 : _a.length) === ((_b = obj2.steps) == null ? void 0 : _b.length));
+    const intermediate = obj1.transitMode === obj2.transitMode && Math.abs(obj1.duration - obj2.duration) <= 0.05 && obj1.startTime === obj2.startTime && obj1.endTime === obj2.endTime && obj1.start.name === obj2.start.name && obj1.start.coords.equals(obj2.start.coords) && obj1.end.name === obj2.end.name && obj1.end.coords.equals(obj2.end.coords) && obj1.coords.length === obj2.coords.length && (obj1.steps === obj2.steps || ((_a = obj1.steps) == null ? void 0 : _a.length) === ((_b = obj2.steps) == null ? void 0 : _b.length));
     if (!intermediate) {
       return false;
     }
@@ -582,7 +591,7 @@ class Leg {
   }
   toJson() {
     return {
-      mode: this.mode,
+      transitMode: this.transitMode,
       start: {
         coords: this.start.coords.toCompressedJson(),
         ...this.start.name && { name: this.start.name }
@@ -591,6 +600,7 @@ class Leg {
         coords: this.end.coords.toCompressedJson(),
         ...this.end.name && { name: this.end.name }
       },
+      distance: Number(this.distance.toFixed(1)),
       duration: Number(this.duration.toFixed(1)),
       coords: this.coords.map((coords) => coords.toCompressedJson()),
       steps: this.steps.map(stepToJson),
@@ -615,13 +625,13 @@ class Leg {
     }));
     return leg;
   }
-  static fromGraphRoute(graphRoute, mode = "WALK") {
+  static fromGraphRoute(graphRoute, transitMode = "WALK") {
     return new Leg({
       start: { coords: graphRoute.start },
       end: { coords: graphRoute.end },
       coords: graphRoute.vertices.map((vertex) => vertex.coords),
       duration: graphRoute.edgesWeights.reduce((acc, weight) => acc + weight, 0),
-      mode,
+      transitMode,
       steps: new StepsBuilder().setGraphRoute(graphRoute).build()
     });
   }
@@ -651,7 +661,7 @@ class Itinerary {
     __publicField(this, "destination");
     __publicField(this, "duration");
     __publicField(this, "legs");
-    __publicField(this, "_mode", null);
+    __publicField(this, "_transitMode", null);
     __publicField(this, "startTime");
     __publicField(this, "endTime");
     __publicField(this, "_coords", null);
@@ -679,30 +689,30 @@ class Itinerary {
   get steps() {
     return this.legs.map((leg) => leg.steps).flat();
   }
-  set mode(_) {
+  set transitMode(_) {
     throw new Error("Itinerary.mode cannot be set. They are calculated from Itinerary.legs.");
   }
-  get mode() {
-    if (!this._mode) {
+  get transitMode() {
+    if (!this._transitMode) {
       let isPublicTransport = false;
       let isBicycle = false;
       let isDriving = false;
       this.legs.forEach((leg) => {
-        isPublicTransport = isPublicTransport || isTransitModePublicTransport(leg.mode);
-        isBicycle = isBicycle || leg.mode === "BIKE";
-        isDriving = isDriving || leg.mode === "CAR";
+        isPublicTransport = isPublicTransport || isTransitModePublicTransport(leg.transitMode);
+        isBicycle = isBicycle || leg.transitMode === "BIKE";
+        isDriving = isDriving || leg.transitMode === "CAR";
       });
       if (isPublicTransport) {
-        this._mode = "MULTI";
+        this._transitMode = "MULTI";
       } else if (isDriving) {
-        this._mode = "CAR";
+        this._transitMode = "CAR";
       } else if (isBicycle) {
-        this._mode = "BIKE";
+        this._transitMode = "BIKE";
       } else {
-        this._mode = "WALK";
+        this._transitMode = "WALK";
       }
     }
-    return this._mode;
+    return this._transitMode;
   }
   set distance(_) {
     throw new Error("Itinerary.distance cannot be set. They are calculated from Itinerary.legs.");
@@ -744,13 +754,13 @@ class Itinerary {
   /**
    * Convert ordered Coordinates to Itinerary
    */
-  static fromOrderedCoordinates(coords, origin, destination, mode = "WALK") {
+  static fromOrderedCoordinates(coords, origin, destination, transitMode = "WALK") {
     const steps = new StepsBuilder().setPathCoords(coords).setStart(origin).setEnd(destination).build();
     const leg = new Leg({
       start: { coords: origin },
       end: { coords: destination },
       coords,
-      mode,
+      transitMode,
       steps
     });
     return new Itinerary({ origin, destination, legs: [leg] });
@@ -774,8 +784,9 @@ class Itinerary {
     return {
       origin: this.origin.toJson(),
       destination: this.destination.toJson(),
+      distance: Number(this.distance.toFixed(1)),
       duration: Number(this.duration.toFixed(1)),
-      mode: this.mode,
+      transitMode: this.transitMode,
       legs: this.legs.map((leg) => leg.toJson()),
       ...this.startTime !== null && { startTime: this.startTime },
       ...this.endTime !== null && { endTime: this.endTime }
@@ -791,8 +802,8 @@ class Itinerary {
       endTime: json.endTime
     });
   }
-  static fromGraphRoute(graphRoute, mode = "WALK") {
-    const leg = Leg.fromGraphRoute(graphRoute, mode);
+  static fromGraphRoute(graphRoute, transitMode = "WALK") {
+    const leg = Leg.fromGraphRoute(graphRoute, transitMode);
     return new Itinerary({
       origin: graphRoute.start,
       destination: graphRoute.end,
@@ -831,13 +842,34 @@ class Itinerary {
     }
   }
   toGeoJson() {
-    return {
+    const transformToPoint = (point, name) => ({
       type: "Feature",
-      properties: {},
+      properties: { name, level: point.level },
       geometry: {
-        type: "MultiLineString",
-        coordinates: this.legs.map((leg) => leg.coords.map(({ lat, lng }) => [lng, lat]))
+        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 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));
+    return {
+      type: "FeatureCollection",
+      features: [
+        transformToPoint(this.origin, "origin"),
+        transformToPoint(this.destination, "destination"),
+        ...multiLineStrings
+      ]
     };
   }
   /**
@@ -991,6 +1023,54 @@ class GraphRouterEngineResults {
     }
     return new GraphRoute(this.source.coords, to.coords, path, edges, edgesWeights);
   }
+  toGeoJson(graph) {
+    return {
+      type: "FeatureCollection",
+      features: [
+        ...graph.vertices.map((v) => {
+          const prev = this.prev[v.id];
+          const dist = this.dist[v.id];
+          const isSource = v === this.source;
+          const isTarget = this.targets.includes(v);
+          const level = v.coords.level;
+          return {
+            type: "Feature",
+            properties: {
+              id: v.id,
+              ...prev && { prev: prev.id },
+              dist: dist === Number.MAX_VALUE ? "infinity" : dist,
+              ...isSource && { name: "source" },
+              ...isTarget && { name: "target" },
+              ...level !== null && { level },
+              ...v.properties
+            },
+            geometry: {
+              type: "Point",
+              coordinates: [v.coords.lng, v.coords.lat]
+            }
+          };
+        }),
+        ...graph.edges.map((e) => {
+          const level = e.level;
+          return {
+            type: "Feature",
+            properties: {
+              id: e.id,
+              ...level !== null && { level },
+              ...e.properties
+            },
+            geometry: {
+              type: "LineString",
+              coordinates: [
+                [e.vertex1.coords.lng, e.vertex1.coords.lat],
+                [e.vertex2.coords.lng, e.vertex2.coords.lat]
+              ]
+            }
+          };
+        })
+      ]
+    };
+  }
 }
 class GraphRouterEngine {
   constructor(graph) {
@@ -1253,7 +1333,7 @@ class NoRouteFoundError extends Error {
 const _OsmGraphUtils = class _OsmGraphUtils {
   static parseNodeProperties(osmNode) {
     return {
-      ...osmNode.name !== null && { name: osmNode.name },
+      ...osmNode.name && { name: osmNode.name },
       ...osmNode.isGate && { isGate: osmNode.isGate },
       ...osmNode.isSubwayEntrance && { isSubwayEntrance: osmNode.isSubwayEntrance },
       ...osmNode.subwayEntranceRef && { subwayEntrsanceRef: osmNode.subwayEntranceRef }
@@ -1261,7 +1341,7 @@ const _OsmGraphUtils = class _OsmGraphUtils {
   }
   static parseWayProperties(osmWay) {
     return {
-      ...osmWay.name !== null && { name: osmWay.name },
+      ...osmWay.name && { name: osmWay.name },
       ...osmWay.isOneway && { isOneway: osmWay.isOneway },
       ...osmWay.areStairs && { areStairs: osmWay.areStairs },
       ...osmWay.isElevator && { isElevator: osmWay.isElevator },
@@ -1350,10 +1430,12 @@ const _OsmGraphUtils = class _OsmGraphUtils {
     return new Graph(verticesMapping.map((v) => v[1]), edges);
   }
 };
-__publicField(_OsmGraphUtils, "HIGHWAYS_PEDESTRIANS", ["footway", "steps", "pedestrian", "living_street", "path", "track", "sidewalk", "elevator"]);
+__publicField(_OsmGraphUtils, "RESTRICTED_PEDESTRIANS_HIGHWAYS", ["motorway", "motorway_link"]);
 __publicField(_OsmGraphUtils, "DEFAULT_WAY_SELECTOR", (way) => {
-  const isElevatorArea = way.tags.highway === "elevator" && way.isArea;
-  return _OsmGraphUtils.HIGHWAYS_PEDESTRIANS.includes(way.tags.highway) && !isElevatorArea && !["no", "private"].includes(way.tags.access) || way.tags.footway === "sidewalk" || way.tags.public_transport === "platform" || way.tags.railway === "platform";
+  if (way.isArea)
+    return false;
+  const isElevatorArea = way.tags.highway === "elevator" && way.isGeometryClosed;
+  return way.tags.highway && !_OsmGraphUtils.RESTRICTED_PEDESTRIANS_HIGHWAYS.includes(way.tags.highway) && !isElevatorArea && !["no", "private"].includes(way.tags.access) || way.tags.footway === "sidewalk" || way.tags.public_transport === "platform" || way.tags.railway === "platform";
 });
 let OsmGraphUtils = _OsmGraphUtils;
 class RemoteRouter {
@@ -1624,7 +1706,7 @@ class CitywayRemoteRouter extends RemoteRouter {
           stepsBuilder.setEnd(legEnd.coords);
           stepsBuilder.setPathCoords(legCoords);
           const leg = new Leg({
-            mode: legMode,
+            transitMode: legMode,
             duration: this.parseDuration(jsonLeg.Duration),
             startTime: jsonDateToTimestamp(jsonLeg.Departure.Time),
             endTime: jsonDateToTimestamp(jsonLeg.Arrival.Time),
@@ -1709,7 +1791,7 @@ class DeutscheBahnRemoteRouter extends RemoteRouter {
         ({ lon, lat }) => new geo.Coordinates(lat, lon, null, level)
       );
       return new Leg({
-        mode: "WALK",
+        transitMode: "WALK",
         coords,
         start: { coords: coords[0] },
         end: { coords: coords[coords.length - 1] }
@@ -1806,7 +1888,7 @@ class IdfmRemoteRouter extends RemoteRouter {
       throw RemoteRoutingError.notFound(this.rname, jsonResponse.error.message);
     }
     const itineraries = this.parseResponse(jsonResponse);
-    const sameModeFound = itineraries.some((itinerary) => itinerary.mode === routerRequest.travelMode);
+    const sameModeFound = itineraries.some((itinerary) => itinerary.transitMode === routerRequest.travelMode);
     if (!sameModeFound) {
       throw RemoteRoutingError.notFound(
         this.rname,
@@ -1949,7 +2031,7 @@ class IdfmRemoteRouter extends RemoteRouter {
         }, []);
         const stepsBuilder = new StepsBuilder().setStart(startSection).setEnd(endSection).setPathCoords(legCoords);
         let transportInfo;
-        let mode = transitModeCorrespondance.get(jsonSection.mode);
+        let transitMode = transitModeCorrespondance.get(jsonSection.mode);
         if (jsonSection.path) {
           const idfmIntermediateSteps = [];
           for (const jsonPathLink of jsonSection.path) {
@@ -1967,7 +2049,7 @@ class IdfmRemoteRouter extends RemoteRouter {
             routeTextColor: jsonSection.display_informations.text_color,
             directionName: jsonSection.display_informations.direction
           };
-          mode = transitModeCorrespondance.get(jsonSection.display_informations.physical_mode);
+          transitMode = transitModeCorrespondance.get(jsonSection.display_informations.physical_mode);
           const legStep = {
             coords: legCoords[0],
             name: transportInfo.directionName,
@@ -1976,7 +2058,7 @@ class IdfmRemoteRouter extends RemoteRouter {
           stepsBuilder.setStepsInfo([legStep]);
         }
         const leg = new Leg({
-          mode,
+          transitMode,
           duration: jsonSection.duration,
           startTime: dateStringToTimestamp(jsonSection.departure_date_time, timeZone),
           endTime: dateStringToTimestamp(jsonSection.arrival_date_time, timeZone),
@@ -2198,7 +2280,7 @@ class OsrmRemoteRouter extends RemoteRouter {
           });
         });
         return new Leg({
-          mode: transitMode,
+          transitMode,
           duration: jsonLeg.duration,
           coords: legCoords,
           start: {
@@ -2306,7 +2388,7 @@ class OtpRemoteRouter extends RemoteRouter {
           });
         }
         const leg = new Leg({
-          mode: jsonLeg.mode,
+          transitMode: jsonLeg.mode,
           duration: jsonLeg.duration,
           startTime: jsonLeg.startTime,
           endTime: jsonLeg.endTime,
@@ -2493,8 +2575,8 @@ class WemapMultiRouter {
       }
       const newRouterRequest = {
         ...routerRequest,
-        origin: ioMapRoute.end,
-        destination,
+        origin,
+        destination: ioMapRoute.start,
         waypoints: []
       };
       try {
@@ -2607,6 +2689,7 @@ class CustomNetworkMap {
       return vertex || null;
     });
     const entryPoints = entryPointsToCheck.filter((it) => it !== null);
+    entryPoints.forEach((v) => graph.exitVertices.add(v));
     const bounds = {
       type: "MultiPolygon",
       coordinates: []
@@ -2838,4 +2921,5 @@ exports.WemapMultiRemoteRouter = WemapMultiRemoteRouter$1;
 exports.WemapMultiRouter = WemapMultiRouter;
 exports.WemapMultiRoutingError = WemapMultiRoutingError;
 exports.getDurationFromLength = getDurationFromLength;
+exports.routerRequestToJson = routerRequestToJson;
 //# sourceMappingURL=index.js.map