@wemap/routers 11.2.2 → 11.2.3

package/package.json

@@ -12,7 +12,7 @@
         "directory": "packages/routers"
     },
     "name": "@wemap/routers",
-    "version": "11.2.2",
+    "version": "11.2.3",
     "bugs": {
         "url": "https://github.com/wemap/wemap-modules-js/issues"
     },
@@ -52,5 +52,5 @@
         },
         "./helpers/*": "./helpers/*"
     },
-    "gitHead": "5038e8ce3a65274d387e28f1c775cc1d3dac9453"
+    "gitHead": "415286b6594d7b9c9ea6c35f9545e6149b2074af"
 }

package/src/wemap-multi/CustomNetworkMap.ts

@@ -2,7 +2,7 @@ import pointInPolygon from '@turf/boolean-point-in-polygon';
 import convexHullFn from '@turf/convex';
 import { Position, MultiPolygon } from '@turf/helpers';
 
-import { Coordinates, GeoGraphRouterOptions, NoRouteFoundError } from '@wemap/geo';
+import { Coordinates, GeoGraphRouterOptions, Level, NoRouteFoundError } from '@wemap/geo';
 import { OsmParser } from '@wemap/osm';
 
 import OsmGraph, { OsmVertex } from '../wemap-osm/OsmGraph.js';
@@ -102,10 +102,20 @@ class CustomNetworkMap {
      */
     getOrderedEntryPointsSortedByDistance(start: Coordinates, end: Coordinates) {
         const entryPointsCopy = [...this.entryPoints];
-        return entryPointsCopy.sort((ep1, ep2) =>
-            Number(ep1.coords.distanceTo(start)) + ep1.coords.distanceTo(end)
-            - ep2.coords.distanceTo(start) - ep2.coords.distanceTo(end)
-        );
+        const levelDiffFactor = 50; // in meters
+        return entryPointsCopy.sort((ep1, ep2) => {
+
+            const distance2D = Number(ep1.coords.distanceTo(start)) + ep1.coords.distanceTo(end)
+            - (ep2.coords.distanceTo(start) + ep2.coords.distanceTo(end))
+        
+            const levelDiffEp1Start = Math.abs(Level.diff(start.level, ep1.coords.level) || 0);
+            const levelDiffEp1End = Math.abs(Level.diff(end.level, ep1.coords.level) || 0);
+            const levelDiffEp2Start = Math.abs(Level.diff(start.level, ep2.coords.level) || 0);
+            const levelDiffEp2End = Math.abs(Level.diff(end.level, ep2.coords.level) || 0);
+            const levelDiff = levelDiffEp1Start + levelDiffEp1End - (levelDiffEp2Start + levelDiffEp2End);
+        
+            return distance2D + levelDiff * levelDiffFactor;
+        });
     }
 
     /**