@wemap/routers 12.12.3 → 12.12.4

package/dist/index.mjs

@@ -9,7 +9,7 @@ import { diffAngleLines, deg2rad, diffAngle, positiveMod, rad2deg } from "@wemap
 import Logger from "@wemap/logger";
 import salesman from "@wemap/salesman.js";
 import polyline from "@mapbox/polyline";
-import pointInPolygon from "@turf/boolean-point-in-polygon";
+import booleanPointInPolygon from "@turf/boolean-point-in-polygon";
 import { OsmTagsUtils, OsmParser, OsmNode } from "@wemap/osm";
 function routerRequestToJson(routerRequest) {
   const { origin, destination, waypoints, ...rest } = routerRequest;
@@ -4626,7 +4626,7 @@ class CustomGraphMap {
     if (!this.routingBounds) {
       return false;
     }
-    return pointInPolygon([coordinates.lng, coordinates.lat], this.routingBounds);
+    return booleanPointInPolygon([coordinates.lng, coordinates.lat], this.routingBounds);
   }
   /**
    * Get the list of entry points sorted by the lowest distance between:
@@ -6867,7 +6867,7 @@ osmtogeojson = function(data, options, featureCallback) {
           function findOuter(inner) {
             var polygonIntersectsPolygon = function(outer2, inner2) {
               for (var i2 = 0; i2 < inner2.length; i2++)
-                if (pointInPolygon2(inner2[i2], outer2))
+                if (pointInPolygon(inner2[i2], outer2))
                   return true;
               return false;
             };
@@ -6876,7 +6876,7 @@ osmtogeojson = function(data, options, featureCallback) {
                 return [+n.lat, +n.lon];
               });
             };
-            var pointInPolygon2 = function(point, polygon) {
+            var pointInPolygon = function(point, polygon) {
               var x = point[0], y = point[1], inside = false;
               for (var i2 = 0, j3 = polygon.length - 1; i2 < polygon.length; j3 = i2++) {
                 var xi = polygon[i2][0], yi = polygon[i2][1];
@@ -13394,7 +13394,10 @@ const _GeoJsonGraphUtils = class _GeoJsonGraphUtils {
         });
       }
     });
-    features.filter((f) => f.geometry.type === "Polygon" && f.properties && OsmTagsUtils.isElevator(f.properties)).forEach((feature) => {
+    features.filter((f) => f.geometry.type === "Polygon" && f.properties && OsmTagsUtils.isElevator(f.properties)).filter((f) => {
+      const polygon = f.geometry;
+      return !elevatorsVertices.flatMap(({ vertices: vertices2 }) => vertices2).some((v) => booleanPointInPolygon([v.coords.lng, v.coords.lat], polygon));
+    }).forEach((feature) => {
       var _a, _b;
       const polygon = feature;
       const entryVertices = polygon.geometry.coordinates[0].map((p) => vertices.filter((v) => v.coords.equalsWithoutLevel(new Coordinates(p[1], p[0], null, v.coords.level)))).flat();
@@ -13582,7 +13585,12 @@ const _OsmGraphUtils = class _OsmGraphUtils {
       }
     });
     let fakeOsmNodeId = -1;
-    osmModel.ways.filter((way) => OsmTagsUtils.isElevator(way.tags) && way.isGeometryClosed).forEach((way) => {
+    osmModel.ways.filter((way) => OsmTagsUtils.isElevator(way.tags) && way.isGeometryClosed).filter((way) => {
+      const polygon = way.getGeoJsonPolygon();
+      return !elevatorVertices.flatMap(([, , vertices]) => vertices).some(
+        (vertex) => booleanPointInPolygon([vertex.coords.lng, vertex.coords.lat], polygon)
+      );
+    }).forEach((way) => {
       const entryVertices = way.nodes.map((node) => verticesMapping.filter(([osmId]) => osmId === node.id).map((vm) => vm[1])).flat();
       const elevatorCenter = way.nodes.reduce((acc, node) => [acc[0] + node.coords.lat, acc[1] + node.coords.lng], [0, 0]).map((val) => val / way.nodes.length);
       const elevatorLevel = entryVertices.reduce((acc, v) => Level.union(acc, v.coords.level), null);