ben/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

expanded dynamic range

Browse source
This commit is contained in:
afischerdev 2024-10-06 11:50:13 +02:00
parent 22842f0305
commit a6ba70a786
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
brouter-core/src/main/java/btools/router/RoutingEngine.java
View file

@ -981,11 +981,16 @@ public class RoutingEngine extends Thread {
logInfo("second check for way points");
resetCache(false);
range = -range;
ok = nodesCache.matchWaypointsToNodes(unmatchedWaypoints, range, islandNodePairs);
List<MatchedWaypoint> tmp = new ArrayList<>();
for (MatchedWaypoint mwp : unmatchedWaypoints) {
if (mwp.crosspoint == null) tmp.add(mwp);
}
ok = nodesCache.matchWaypointsToNodes(tmp, range, islandNodePairs);
}
if (!ok) {
for (MatchedWaypoint mwp :unmatchedWaypoints) {
if (mwp.crosspoint == null) throw new IllegalArgumentException(mwp.name + "-position not mapped in existing datafile");
if (!ok) {
for (MatchedWaypoint mwp : unmatchedWaypoints) {
if (mwp.crosspoint == null)
throw new IllegalArgumentException(mwp.name + "-position not mapped in existing datafile");
}
}
if (useDynamicDistance) {
@ -994,7 +999,7 @@ public class RoutingEngine extends Thread {
MatchedWaypoint wp = unmatchedWaypoints.get(i);
if (wp.waypoint.calcDistance(wp.crosspoint) > routingContext.waypointCatchingRange) {
MatchedWaypoint nmw = new MatchedWaypoint();
if (i==0) {
if (i == 0) {
nmw.waypoint = new OsmNode(wp.waypoint.ilon, wp.waypoint.ilat);
nmw.crosspoint = new OsmNode(wp.waypoint.ilon, wp.waypoint.ilat);
nmw.direct = true;