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

update misplace check routine for roundabouts

Browse source
This commit is contained in:
afischerdev 2023-04-22 13:17:52 +02:00
parent 1df5a468b0
commit 1779b1d3b5
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -549,12 +549,6 @@ public class RoutingEngine extends Thread {
ArrayList<OsmPathElement> removeBackList = new ArrayList<>(); ArrayList<OsmPathElement> removeBackList = new ArrayList<>();
ArrayList<OsmPathElement> removeForeList = new ArrayList<>(); ArrayList<OsmPathElement> removeForeList = new ArrayList<>();
ArrayList<Integer> removeVoiceHintList = new ArrayList<>(); ArrayList<Integer> removeVoiceHintList = new ArrayList<>();
int lon0,
lat0,
lon1,
lat1,
lon2,
lat2;
OsmPathElement last = null; OsmPathElement last = null;
OsmPathElement lastJunction = null; OsmPathElement lastJunction = null;
CompactLongMap<OsmTrack.OsmPathElementHolder> lastJunctions = new CompactLongMap<>(); CompactLongMap<OsmTrack.OsmPathElementHolder> lastJunctions = new CompactLongMap<>();
@ -571,6 +565,18 @@ public class RoutingEngine extends Thread {
int junctions = 0; int junctions = 0;
tmpback = tt.nodes.get(indexback); tmpback = tt.nodes.get(indexback);
tmpfore = t.nodes.get(indexfore); tmpfore = t.nodes.get(indexfore);
if (tmpback.message != null && tmpback.message.isRoundabout()) {
removeBackList.clear();
removeForeList.clear();
removeVoiceHintList.clear();
return false;
}
if (tmpfore.message != null && tmpfore.message.isRoundabout()) {
removeBackList.clear();
removeForeList.clear();
removeVoiceHintList.clear();
return false;
}
int dist = tmpback.calcDistance(tmpfore); int dist = tmpback.calcDistance(tmpfore);
if (1 == 1) { if (1 == 1) {
OsmTrack.OsmPathElementHolder detours = tt.getFromDetourMap(tmpback.getIdFromPos()); OsmTrack.OsmPathElementHolder detours = tt.getFromDetourMap(tmpback.getIdFromPos());