@wemap/routers 11.0.0-alpha.15 → 11.0.0-alpha.18

package/dist/index.mjs

@@ -11,7 +11,6 @@ import Logger from "@wemap/logger";
 import Polyline from "@mapbox/polyline";
 import pointInPolygon from "@turf/boolean-point-in-polygon";
 import convexHullFn from "@turf/convex";
-import { polygon } from "@turf/helpers";
 function getDurationFromLength(length, speed = 5) {
   return length / (speed * 1e3 / 3600);
 }
@@ -1637,7 +1636,7 @@ class WemapMultiRouter {
     }
     let ioMapItinerary;
     const mapWithStart = ioMapsToTest.find((map) => map.isPointInside(start));
-    const wemapOsmRouterOptions = !options || !("useStairs" in options) && options.useStairs ? WemapOsmRouterOptions.DEFAULT : WemapOsmRouterOptions.WITHOUT_STAIRS;
+    const wemapOsmRouterOptions = !options || !("useStairs" in options) || options.useStairs ? WemapOsmRouterOptions.DEFAULT : WemapOsmRouterOptions.WITHOUT_STAIRS;
     if (mapWithStart && mapWithStart.isPointInside(end)) {
       try {
         ioMapItinerary = mapWithStart.getItineraryInsideMap(start, end, wemapOsmRouterOptions);
@@ -1786,14 +1785,17 @@ class CustomNetworkMap {
     });
     this.entryPoints = entryPoints;
     if (bounds) {
-      this.bounds = polygon([bounds.map((coords) => [coords.lng, coords.lat])]);
+      this.bounds = bounds;
     } else {
-      const polygon2 = [network.nodes.map((node) => [node.coords.lng, node.coords.lat])];
-      const convexHull = convexHullFn({ type: "polygon", coordinates: polygon2 });
+      const polygon = [network.nodes.map((node) => [node.coords.lng, node.coords.lat])];
+      const convexHull = convexHullFn({ type: "polygon", coordinates: polygon });
       if (!convexHull) {
         throw new Error(`Cannot calculate convexHull of network "${name}"`);
       }
-      this.bounds = convexHull;
+      this.bounds = {
+        type: "MultiPolygon",
+        coordinates: [convexHull.geometry.coordinates]
+      };
     }
   }
   static fromOsmXml(osmXmlString, name = null) {
@@ -1803,11 +1805,25 @@ class CustomNetworkMap {
     if (entryPoints.some((el) => el === null) || new Set(entryPoints).size !== entryPoints.length) {
       throw new Error("Cannot parse wemap:routing-io correctly");
     }
-    const wayBounds = osmModel.ways.find(({ tags }) => tags["wemap:routing-bounds"]);
-    if (!wayBounds) {
+    const bounds = {
+      type: "MultiPolygon",
+      coordinates: []
+    };
+    osmModel.ways.filter(({ tags }) => tags["wemap:routing-bounds"]).forEach((way) => {
+      bounds.coordinates.push([
+        way.nodes.reduce((acc, node) => {
+          acc.push([node.coords.lng, node.coords.lat]);
+          return acc;
+        }, [])
+      ]);
+    });
+    osmModel.relations.filter((rel) => rel.tags["wemap:routing-bounds"] && rel.isMultipolygon()).forEach((rel) => {
+      const polygon = rel.getGeoJsonPolygon();
+      polygon && bounds.coordinates.push(polygon.coordinates);
+    });
+    if (!bounds.coordinates.length) {
       throw new Error('Search bounds is undefined. Please use OSM tag : "wemap:routing-bounds=yes"');
     }
-    const bounds = wayBounds.nodes.map((node) => node.coords);
     return new CustomNetworkMap(network, entryPoints, bounds, name);
   }
   isPointInside(coordinates) {