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

Merge pull request #729 from afischerdev/gen-beeline

Browse source 
Enable a dynamic range search for matched way points
This commit is contained in:
afischerdev 2024-11-17 10:33:59 +01:00 • committed by GitHub
commit d986ce9776
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 145 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
brouter-core/src/main/java/btools/router/FormatJson.java
View file

@ -122,7 +122,7 @@ public class FormatJson extends Formatter {
.append(sele).append("],\n");
nn = n;
}
sb.deleteCharAt(sb.lastIndexOf(","));
if (t.nodes != null && !t.nodes.isEmpty()) sb.deleteCharAt(sb.lastIndexOf(","));
sb.append(" ]\n");
sb.append(" }\n");

3
brouter-core/src/main/java/btools/router/RoutingContext.java
View file

@ -76,6 +76,7 @@ public final class RoutingContext {
public double waypointCatchingRange;
public boolean correctMisplacedViaPoints;
public double correctMisplacedViaPointsDistance;
public boolean useDynamicDistance;
private void setModel(String className) {
if (className == null) {
@ -168,6 +169,8 @@ public final class RoutingContext {
// Constant power of the biker (in W)
bikerPower = expctxGlobal.getVariableValue("bikerPower", 100.f);
useDynamicDistance = expctxGlobal.getVariableValue("use_dynamic_range", 0f) == 1f;
boolean test = expctxGlobal.getVariableValue("check_start_way", 1f) == 1f;
if (!test) expctxGlobal.freeNoWays();

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

@ -47,6 +47,8 @@ public class RoutingEngine extends Thread {
private int MAX_STEPS_CHECK = 10;
private int MAX_DYNAMIC_RANGE = 60000;
protected OsmTrack foundTrack = new OsmTrack();
private OsmTrack foundRawTrack = null;
private int alternativeIndex = 0;
@ -587,7 +589,13 @@ public class RoutingEngine extends Thread {
mwp.direct = waypoints.get(i).direct;
matchedWaypoints.add(mwp);
}
int startSize = matchedWaypoints.size();
matchWaypointsToNodes(matchedWaypoints);
if (startSize < matchedWaypoints.size()) {
refTracks = new OsmTrack[matchedWaypoints.size()]; // used ways for alternatives
lastTracks = new OsmTrack[matchedWaypoints.size()];
hasDirectRouting = true;
}
routingContext.checkMatchedWaypointAgainstNogos(matchedWaypoints);
@ -615,6 +623,12 @@ public class RoutingEngine extends Thread {
if (nearbyTrack != null) {
matchedWaypoints.add(nearbyTrack.endPoint);
}
} else {
if (lastTracks.length < matchedWaypoints.size()) {
refTracks = new OsmTrack[matchedWaypoints.size()]; // used ways for alternatives
lastTracks = new OsmTrack[matchedWaypoints.size()];
hasDirectRouting = true;
}
}
OsmPath.seg = 1; // set segment counter
@ -968,7 +982,60 @@ public class RoutingEngine extends Thread {
// geometric position matching finding the nearest routable way-section
private void matchWaypointsToNodes(List<MatchedWaypoint> unmatchedWaypoints) {
resetCache(false);
nodesCache.matchWaypointsToNodes(unmatchedWaypoints, routingContext.waypointCatchingRange, islandNodePairs);
boolean useDynamicDistance = routingContext.useDynamicDistance;
double range = routingContext.waypointCatchingRange;
boolean ok = nodesCache.matchWaypointsToNodes(unmatchedWaypoints, range, islandNodePairs);
if (!ok && useDynamicDistance) {
logInfo("second check for way points");
resetCache(false);
range = -MAX_DYNAMIC_RANGE;
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 (useDynamicDistance) {
List<MatchedWaypoint> waypoints = new ArrayList<>();
for (int i = 0; i < unmatchedWaypoints.size(); i++) {
MatchedWaypoint wp = unmatchedWaypoints.get(i);
if (wp.waypoint.calcDistance(wp.crosspoint) > routingContext.waypointCatchingRange) {
MatchedWaypoint nmw = new MatchedWaypoint();
if (i == 0) {
OsmNodeNamed onn = new OsmNodeNamed(wp.waypoint);
onn.name = "from";
nmw.waypoint = onn;
nmw.name = onn.name;
nmw.crosspoint = new OsmNode(wp.waypoint.ilon, wp.waypoint.ilat);
nmw.direct = true;
onn = new OsmNodeNamed(wp.crosspoint);
onn.name = wp.name + "_add";
wp.waypoint = onn;
} else {
OsmNodeNamed onn = new OsmNodeNamed(wp.crosspoint);
onn.name = wp.name + "_add";
nmw.waypoint = onn;
nmw.crosspoint = new OsmNode(wp.crosspoint.ilon, wp.crosspoint.ilat);
nmw.node1 = new OsmNode(wp.node1.ilon, wp.node1.ilat);
nmw.node2 = new OsmNode(wp.node2.ilon, wp.node2.ilat);
nmw.direct = true;
wp.crosspoint = new OsmNode(wp.waypoint.ilon, wp.waypoint.ilat);
}
if (wp.name != null) nmw.name = wp.name;
waypoints.add(nmw);
wp.name = wp.name + "_add";
}
waypoints.add(wp);
}
unmatchedWaypoints.clear();
unmatchedWaypoints.addAll(waypoints);
}
}
private OsmTrack searchTrack(MatchedWaypoint startWp, MatchedWaypoint endWp, OsmTrack nearbyTrack, OsmTrack refTrack) {