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

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "11.0.0-alpha.15",
+    "version": "11.0.0-alpha.18",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -34,10 +34,10 @@
         "@turf/convex": "^6.5.0",
         "@turf/helpers": "^6.5.0",
         "@types/mapbox__polyline": "^1.0.2",
-        "@wemap/geo": "^11.0.0-alpha.15",
-        "@wemap/logger": "^11.0.0-alpha.15",
-        "@wemap/maths": "^11.0.0-alpha.15",
-        "@wemap/osm": "^11.0.0-alpha.15"
+        "@wemap/geo": "^11.0.0-alpha.16",
+        "@wemap/logger": "^11.0.0-alpha.16",
+        "@wemap/maths": "^11.0.0-alpha.16",
+        "@wemap/osm": "^11.0.0-alpha.18"
     },
     "devDependencies": {
         "@types/fetch-mock": "^7.3.5",
@@ -50,5 +50,5 @@
             "require": "./dist/index.js"
         }
     },
-    "gitHead": "375928c186d4d20983d6e0d7cfb52274832e5a10"
+    "gitHead": "46bef48dec0bce16030ab353c300db8d0f649bd1"
 }

package/src/wemap-multi/CustomNetworkMap.ts

@@ -1,6 +1,6 @@
 import pointInPolygon from '@turf/boolean-point-in-polygon';
 import convexHullFn from '@turf/convex';
-import { Feature, Polygon, polygon as turfPolygon, Position } from '@turf/helpers';
+import { Position, MultiPolygon } from '@turf/helpers';
 
 import { Coordinates, NoRouteFoundError } from '@wemap/geo';
 import { OsmParser, OsmNetworkUtils, OsmNetwork, OsmGraphNode } from '@wemap/osm';
@@ -13,14 +13,14 @@ class CustomNetworkMap {
     name: string | null;
     network: OsmNetwork;
     router: WemapOsmRouter;
-    bounds: Feature<Polygon>;
+    bounds: MultiPolygon;
     entryPoints: OsmGraphNode[];
     disabledWays = new Set<number>();
 
     constructor(
         network: OsmNetwork,
         entryPoints: OsmGraphNode[],
-        bounds: Coordinates[] | null = null,
+        bounds: MultiPolygon | null = null,
         name: string | null = null) {
 
         this.name = name;
@@ -37,14 +37,17 @@ class CustomNetworkMap {
 
         // Bounds
         if (bounds) {
-            this.bounds = turfPolygon([bounds.map(coords => [coords.lng, coords.lat])]);
+            this.bounds = bounds;
         } else {
             const polygon = [network.nodes.map(node => [node.coords.lng, node.coords.lat] as Position)];
             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]
+            };
         }
     }
 
@@ -63,11 +66,29 @@ class CustomNetworkMap {
             throw new Error('Cannot parse wemap:routing-io correctly');
         }
 
-        const wayBounds = osmModel.ways.find(({ tags }) => tags['wemap:routing-bounds']);
-        if (!wayBounds) {
+        const bounds: MultiPolygon = {
+            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;
+                }, [] as Position[])
+                ]);
+            });
+        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);
     }
 

package/src/wemap-multi/WemapMultiRouter.ts

@@ -124,7 +124,7 @@ class WemapMultiRouter {
         const mapWithStart = ioMapsToTest.find(map => map.isPointInside(start));
 
         // Create WemapOsmRouterOptions from WemapMultiRouterOptions
-        const wemapOsmRouterOptions = !options || !('useStairs' in options) && options.useStairs
+        const wemapOsmRouterOptions = !options || !('useStairs' in options) || options.useStairs
             ? WemapOsmRouterOptions.DEFAULT
             : WemapOsmRouterOptions.WITHOUT_STAIRS;