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

move process voice hint, speed profile to the end

Browse source
This commit is contained in:
afischerdev 2023-01-15 17:43:51 +01:00
parent 2b9a9d5bdd
commit 4867368296
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -378,13 +378,17 @@ public class RoutingEngine extends Thread {
if (routingContext.correctMisplacedViaPoints && !matchedWaypoints.get(i).direct) { if (routingContext.correctMisplacedViaPoints && !matchedWaypoints.get(i).direct) {
changed = snappPathConnection(totaltrack, seg, routingContext.inverseRouting ? matchedWaypoints.get(i + 1) : matchedWaypoints.get(i)); changed = snappPathConnection(totaltrack, seg, routingContext.inverseRouting ? matchedWaypoints.get(i + 1) : matchedWaypoints.get(i));
} }
// if (wptIndex > 0)
// matchedWaypoints.get(wptIndex).indexInTrack = totaltrack.nodes.size() - 1;
totaltrack.appendTrack(seg); totaltrack.appendTrack(seg);
lastTracks[i] = seg; lastTracks[i] = seg;
} }
if (routingContext.poipoints != null) totaltrack.pois = routingContext.poipoints;
totaltrack.matchedWaypoints = matchedWaypoints;
totaltrack.processVoiceHints(routingContext);
totaltrack.prepareSpeedProfile(routingContext);
if (routingContext.poipoints != null)
totaltrack.pois = routingContext.poipoints;
totaltrack.matchedWaypoints = matchedWaypoints; totaltrack.matchedWaypoints = matchedWaypoints;
return totaltrack; return totaltrack;
} }
@ -1214,8 +1218,6 @@ public class RoutingEngine extends Thread {
// for final track.. // for final track..
if (guideTrack != null) { if (guideTrack != null) {
track.copyDetours(guideTrack); track.copyDetours(guideTrack);
track.processVoiceHints(routingContext);
track.prepareSpeedProfile(routingContext);
} }
return track; return track;
} }