@wemap/routers 12.12.0 → 12.12.1

package/dist/index.mjs

@@ -2403,6 +2403,12 @@ const _GraphRouterOptionsBuilder = class _GraphRouterOptionsBuilder {
       }
       return duration;
     };
+    const weightVertexFn = (vertex) => {
+      if (vertex.properties.isTurnstile) {
+        return 5;
+      }
+      return 0;
+    };
     const acceptEdgeFn = (edge) => {
       if (edge.properties.wheelchair) {
         if (this.isWheelchair && edge.properties.wheelchair === "no")
@@ -2441,6 +2447,7 @@ const _GraphRouterOptionsBuilder = class _GraphRouterOptionsBuilder {
         projectionMaxDistance: this.projectionMaxDistance
       },
       weightEdgeFn,
+      weightVertexFn,
       acceptEdgeFn,
       projectionMaxDistance: this.projectionMaxDistance,
       useMultiLevelSegments: this.useMultiLevelSegments
@@ -2552,6 +2559,7 @@ class GraphRouterEngine {
       return (((_a = options.acceptEdgeFn) == null ? void 0 : _a.call(options, e)) ?? true) && !this.disabledEdges.has(e);
     });
     const weightEdgeFn = options.weightEdgeFn || ((edge) => edge.length);
+    const weightVertexFn = options.weightVertexFn || ((vertex) => 0);
     const getVertexWithMinDistance = (vertices) => {
       let minDistance = Number.MAX_VALUE;
       let vertex = null;
@@ -2577,7 +2585,7 @@ class GraphRouterEngine {
       }
       edges.filter((edge) => edge.vertex1 == u || !edge.properties.isOneway && edge.vertex2 == u).forEach((edge) => {
         const v = u === edge.vertex1 ? edge.vertex2 : edge.vertex1;
-        const distance = weightEdgeFn(edge);
+        const distance = weightEdgeFn(edge) + weightVertexFn(v);
         const alt = dist[u.id] + distance;
         if (alt < dist[v.id]) {
           dist[v.id] = alt;
@@ -13268,7 +13276,7 @@ const _GeoJsonGraphUtils = class _GeoJsonGraphUtils {
     return {
       ...feature.properties.id && { externalId: feature.properties.id },
       ...feature.id && { externalId: feature.id },
-      ...OsmTagsUtils.name(feature.properties) && { name: OsmTagsUtils.name(feature.properties) },
+      ...OsmTagsUtils.elementName(feature.properties) && { name: OsmTagsUtils.elementName(feature.properties) },
       ...OsmTagsUtils.isOneway(feature.properties) && { isOneway: true },
       ...OsmTagsUtils.areStairs(feature.properties) && { areStairs: true },
       ...OsmTagsUtils.isElevator(feature.properties) && { isElevator: true },
@@ -13476,7 +13484,7 @@ const _OsmGraphUtils = class _OsmGraphUtils {
   static parseNodeProperties(osmNode) {
     return {
       ...osmNode.id && { externalId: osmNode.id },
-      ...OsmTagsUtils.name(osmNode.tags) && { name: OsmTagsUtils.name(osmNode.tags) },
+      ...OsmTagsUtils.elementName(osmNode.tags) && { name: OsmTagsUtils.elementName(osmNode.tags) },
       ...OsmTagsUtils.isGate(osmNode.tags) && { isGate: true },
       ...OsmTagsUtils.isSubwayEntrance(osmNode.tags) && { isSubwayEntrance: true },
       ...OsmTagsUtils.getRef(osmNode.tags) && { subwayEntrsanceRef: OsmTagsUtils.getRef(osmNode.tags) }
@@ -13485,7 +13493,7 @@ const _OsmGraphUtils = class _OsmGraphUtils {
   static parseWayProperties(osmWay) {
     return {
       ...osmWay.id && { externalId: osmWay.id },
-      ...OsmTagsUtils.name(osmWay.tags) && { name: OsmTagsUtils.name(osmWay.tags) },
+      ...OsmTagsUtils.elementName(osmWay.tags) && { name: OsmTagsUtils.elementName(osmWay.tags) },
       ...OsmTagsUtils.isOneway(osmWay.tags) && { isOneway: OsmTagsUtils.isOneway(osmWay.tags) },
       ...OsmTagsUtils.areStairs(osmWay.tags) && { areStairs: OsmTagsUtils.areStairs(osmWay.tags) },
       ...OsmTagsUtils.isElevator(osmWay.tags) && { isElevator: OsmTagsUtils.isElevator(osmWay.tags) },
@@ -13608,22 +13616,17 @@ const _OsmGraphUtils = class _OsmGraphUtils {
     });
     let routingBounds = {
       type: "MultiPolygon",
-      coordinates: [
-        ...osmModel.ways.filter((way) => OsmTagsUtils.isRoutingBounds(way.tags) && way.isGeometryClosed).map((way) => {
-          var _a;
-          return (_a = way.getGeoJsonPolygon()) == null ? void 0 : _a.coordinates;
-        }),
-        ...osmModel.relations.filter((rel) => OsmTagsUtils.isRoutingBounds(rel.tags) && rel.isMultipolygon()).map((rel) => {
-          var _a;
-          return (_a = rel.getGeoJsonPolygon()) == null ? void 0 : _a.coordinates;
-        })
-      ].filter((it) => typeof it === "object")
+      coordinates: []
     };
-    if (routingBounds.coordinates.length === 0) {
-      routingBounds = void 0;
-    }
+    osmModel.ways.filter((way) => OsmTagsUtils.isRoutingBounds(way.tags)).map((way) => way.getGeoJsonPolygon()).forEach((polygon) => polygon && routingBounds.coordinates.push(polygon.coordinates));
+    osmModel.relations.filter((rel) => OsmTagsUtils.isRoutingBounds(rel.tags)).map((rel) => rel.getGeoJsonPolygon()).forEach((polygon) => polygon && routingBounds.coordinates.push(polygon.coordinates));
     callbackVerticesMapping == null ? void 0 : callbackVerticesMapping(verticesMapping);
-    return new Graph(verticesMapping.map((v) => v[1]), edges, routingBounds, Array.from(routingBoundsEntryPoints));
+    return new Graph(
+      verticesMapping.map((v) => v[1]),
+      edges,
+      routingBounds.coordinates.length > 0 ? routingBounds : void 0,
+      Array.from(routingBoundsEntryPoints)
+    );
   }
 };
 __publicField(_OsmGraphUtils, "RESTRICTED_PEDESTRIANS_HIGHWAYS", ["motorway", "motorway_link"]);