Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #2855, fix uturns

Browse source
This commit is contained in:
Victor Shcherb 2016-07-25 01:15:13 +02:00
parent 19177daf2d
commit 3cc7ad3d86
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
View file

@ -465,16 +465,16 @@ public class RouteResultPreparation {
ut = false;
}
}
String highway = result.get(i).getObject().getHighway();
if(highway == null || highway.endsWith("track") || highway.endsWith("services") || highway.endsWith("service")
|| highway.endsWith("path")) {
// String highway = result.get(i).getObject().getHighway();
// if(highway == null || highway.endsWith("track") || highway.endsWith("services") || highway.endsWith("service")
// || highway.endsWith("path")) {
// ut = false;
// }
if (result.get(i - 1).getObject().getOneway() == 0 || result.get(i + 1).getObject().getOneway() == 0) {
ut = false;
}
if (result.get(i).getObject().getOneway() == 0 || result.get(i + 1).getObject().getOneway() == 0) {
ut = false;
}
if (!Algorithms.objectEquals(result.get(i).getObject().getName(),
result.get(i + 1).getObject().getName())) {
if (!Algorithms.objectEquals(getStreetName(result, i - 1, false),
getStreetName(result, i + 1, true))) {
ut = false;
}
if (ut) {
@ -494,6 +494,23 @@ public class RouteResultPreparation {
return null;
}
private String getStreetName(List<RouteSegmentResult> result, int i, boolean dir) {
String nm = result.get(i).getObject().getName();
if (Algorithms.isEmpty(nm)) {
if (!dir) {
if (i > 0) {
nm = result.get(i - 1).getObject().getName();
}
} else {
if(i < result.size() - 1) {
nm = result.get(i + 1).getObject().getName();
}
}
}
return nm;
}
private void determineTurnsToMerge(boolean leftside, List<RouteSegmentResult> result) {
RouteSegmentResult nextSegment = null;
double dist = 0;