From 8e008a8d6699aa2f15af8eb99e75698ff3f5f3fb Mon Sep 17 00:00:00 2001
From: afischerdev <afischer@dbserv.de>
Date: Fri, 30 Jul 2021 14:15:12 +0200
Subject: [PATCH] hardcoded waypoint distance to variable

---
 brouter-core/src/main/java/btools/router/RoutingContext.java   | 3 +++
 brouter-core/src/main/java/btools/router/RoutingEngine.java    | 2 +-
 .../src/main/java/btools/mapaccess/NodesCache.java             | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/brouter-core/src/main/java/btools/router/RoutingContext.java b/brouter-core/src/main/java/btools/router/RoutingContext.java
index 03afa4b..7c3192b 100644
--- a/brouter-core/src/main/java/btools/router/RoutingContext.java
+++ b/brouter-core/src/main/java/btools/router/RoutingContext.java
@@ -79,6 +79,7 @@ public final class RoutingContext
   public double starttimeoffset;
   public boolean transitonly;
 
+  public double waypointCatchingRange;
 
   private void setModel( String className )
   {
@@ -144,6 +145,8 @@ public final class RoutingContext
     bikeMode = 0.f != expctxGlobal.getVariableValue( "validForBikes", 0.f );
     footMode = 0.f != expctxGlobal.getVariableValue( "validForFoot", 0.f );
 
+    waypointCatchingRange = expctxGlobal.getVariableValue( "waypointCatchingRange", 250.f );
+
     // turn-restrictions used per default for car profiles
     considerTurnRestrictions = 0.f != expctxGlobal.getVariableValue( "considerTurnRestrictions", carMode ? 1.f : 0.f );
 
diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java
index 9d247cb..a5022ba 100644
--- a/brouter-core/src/main/java/btools/router/RoutingEngine.java
+++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java
@@ -452,7 +452,7 @@ public class RoutingEngine extends Thread
   private void matchWaypointsToNodes( List<MatchedWaypoint> unmatchedWaypoints )
   {
     resetCache( false );
-    nodesCache.matchWaypointsToNodes( unmatchedWaypoints, 250., islandNodePairs );
+    nodesCache.matchWaypointsToNodes( unmatchedWaypoints, routingContext.waypointCatchingRange, islandNodePairs );
   }
 
   private OsmTrack searchTrack( MatchedWaypoint startWp, MatchedWaypoint endWp, OsmTrack nearbyTrack, OsmTrack refTrack )
diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java
index 14d117f..e165e0c 100644
--- a/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java
+++ b/brouter-mapaccess/src/main/java/btools/mapaccess/NodesCache.java
@@ -338,7 +338,7 @@ public final class NodesCache
 
   public void matchWaypointsToNodes( List<MatchedWaypoint> unmatchedWaypoints, double maxDistance, OsmNodePairSet islandNodePairs )
   {
-    waypointMatcher = new WaypointMatcherImpl( unmatchedWaypoints, 250., islandNodePairs );
+    waypointMatcher = new WaypointMatcherImpl( unmatchedWaypoints, maxDistance, islandNodePairs );
     for( MatchedWaypoint mwp : unmatchedWaypoints )
     {
       preloadPosition( mwp.waypoint );