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

Reimplement turn:lanes merge

Browse source
This commit is contained in:
Victor Shcherb 2015-01-13 10:25:56 +01:00
parent 27e1015386
commit 80bbf423ca
2 changed files with 123 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,6 +44,8 @@ public class RouteResultPreparation {
calculateTimeSpeed(ctx, result);
addTurnInfo(ctx.leftSideNavigation, result);
determineTurnsToMerge(ctx.leftSideNavigation, result);
addTurnInfoDescriptions(result);
return result;
}
@ -331,8 +333,6 @@ public class RouteResultPreparation {
private void addTurnInfo(boolean leftside, List<RouteSegmentResult> result) {
int prevSegment = -1;
float dist = 0;
int next = 1;
for (int i = 0; i <= result.size(); i = next) {
TurnType t = null;
@ -341,6 +341,43 @@ public class RouteResultPreparation {
t = getTurnInfo(result, i, leftside);
// justify turn
if(t != null && i < result.size() - 1) {
TurnType jt = justifyUTurn(leftside, result, i, t);
if(jt != null) {
t = jt;
next = i + 2;
}
}
result.get(i).setTurnType(t);
}
}
}
protected void addTurnInfoDescriptions(List<RouteSegmentResult> result) {
int prevSegment = -1;
float dist = 0;
for (int i = 0; i <= result.size(); i++) {
if (i == result.size() || result.get(i).getTurnType() != null) {
if (prevSegment >= 0) {
String turn = result.get(prevSegment).getTurnType().toString();
if (result.get(prevSegment).getTurnType().getLanes() != null) {
turn += Arrays.toString(result.get(prevSegment).getTurnType().getLanes());
}
result.get(prevSegment).setDescription(
turn + MessageFormat.format(" and go {0,number,#.##} meters", dist));
if (result.get(prevSegment).getTurnType().isSkipToSpeak()) {
result.get(prevSegment).setDescription("-*" + result.get(prevSegment).getDescription());
}
}
prevSegment = i;
dist = 0;
}
if (i < result.size()) {
dist += result.get(i).getDistance();
}
}
}
protected TurnType justifyUTurn(boolean leftside, List<RouteSegmentResult> result, int i, TurnType t) {
boolean tl = TurnType.TL == t.getValue();
boolean tr = TurnType.TR == t.getValue();
if(tl || tr) {
@ -361,38 +398,14 @@ public class RouteResultPreparation {
}
if (ut) {
if (tl && TurnType.TL == tnext.getValue()) {
next = i + 2;
t = TurnType.valueOf(TurnType.TU, false);
return TurnType.valueOf(TurnType.TU, false);
} else if (tr && TurnType.TR == tnext.getValue()) {
next = i + 2;
t = TurnType.valueOf(TurnType.TU, true);
return TurnType.valueOf(TurnType.TU, true);
}
}
}
}
}
result.get(i).setTurnType(t);
}
if (t != null || i == result.size()) {
if (prevSegment >= 0) {
String turn = result.get(prevSegment).getTurnType().toString();
if (result.get(prevSegment).getTurnType().getLanes() != null) {
turn += Arrays.toString(result.get(prevSegment).getTurnType().getLanes());
}
result.get(prevSegment).setDescription(turn + MessageFormat.format(" and go {0,number,#.##} meters", dist));
if(result.get(prevSegment).getTurnType().isSkipToSpeak()) {
result.get(prevSegment).setDescription("-*"+result.get(prevSegment).getDescription());
}
}
prevSegment = i;
dist = 0;
}
if (i < result.size()) {
dist += result.get(i).getDistance();
}
}
determineTurnsToMerge(leftside, result);
return null;
}
private void determineTurnsToMerge(boolean leftside, List<RouteSegmentResult> result) {
@ -421,8 +434,15 @@ public class RouteResultPreparation {
}
// Only allow slight turns that are nearby to be merged.
if (currentSegment.getDistance() < 60 && nextTurn.getLanes().length <= currentTurn.getLanes().length
&& TurnType.isSlightTurn(currentTurn.getValue())) {
// [disabled cause it is valuable for two consequent sharp turns as well]
// the distance could be longer on highways and shorter in city
String hw = currentSegment.getObject().getHighway();
double mergeDistance = 200;
if(hw != null && (hw.startsWith("trunk") || hw.startsWith("motorway"))) {
mergeDistance = 400;
}
if (currentSegment.getDistance() < mergeDistance/*
&& TurnType.isSlightTurn(currentTurn.getValue())*/) {
mergeTurnLanes(leftside, currentSegment, nextSegment);
}
}
@ -435,36 +455,75 @@ public class RouteResultPreparation {
&& TurnType.getPrimaryTurn(nextTurn.getLanes()[0]) != 0;
if (isUsingTurnLanes) {
int[] lanes = new int[currentTurn.getLanes().length];
// Unset the allowed lane bit
for (int i = 0; i < lanes.length; i++) {
lanes[i] = currentTurn.getLanes()[i] & ~1;
}
// Find the first lane that matches (based on the turn being taken), and how many lanes match
int matchingIndex = 0;
int maxMatchedLanes = 0;
for (int i = 0; i < lanes.length; i++) {
int matchedLanes = 0;
for (int j = 0; j < nextTurn.getLanes().length - i; j++) {
if (TurnType.getPrimaryTurn(nextTurn.getLanes()[j])
== TurnType.getPrimaryTurn(currentTurn.getLanes()[i + j])) {
matchedLanes++;
int activeIndex = -1;
int activeLen = 0;
// define enabled lanes
for(int i = 0; i < lanes.length; i++) {
int ln = currentTurn.getLanes()[i];
lanes[i] = ln & ~1;
if((ln & 1) > 0) {
if(activeIndex == -1) {
activeIndex = i;
activeLen++;
} else {
break;
activeLen++;
}
}
if (matchedLanes > maxMatchedLanes) {
matchingIndex = i;
maxMatchedLanes = matchedLanes;
}
if(activeLen < 2) {
return;
}
int targetActiveIndex = -1;
int targetActiveLen = 0;
int[] nextLanes = nextTurn.getLanes();
for(int i = 0; i < nextLanes.length; i++) {
int ln = nextLanes[i];
if((ln & 1) > 0) {
if(targetActiveIndex == -1) {
targetActiveIndex = i;
targetActiveLen++;
} else {
targetActiveLen++;
}
}
if (maxMatchedLanes <= 1) {
}
if(targetActiveIndex == -1) {
return;
}
boolean changed = false;
// next turn is left
if(targetActiveIndex == 0) {
// let only the most left lanes be enabled
if(targetActiveLen <= activeLen) {
activeLen = targetActiveLen;
changed = true;
}
} else if(targetActiveIndex + targetActiveLen == nextLanes.length) {
// next turn is right
// let only the most right lanes be enabled
if(targetActiveLen <= activeLen) {
activeIndex += (activeLen - targetActiveLen);
changed = true;
}
} else {
// next turn is get through (take out the left and the right turn)
if(nextLanes.length >= activeLen) {
float ratio = (nextLanes.length / (float)activeLen);
activeLen = (int) Math.ceil(targetActiveLen * ratio);
activeIndex = (int) Math.floor(targetActiveIndex / ratio);
changed = true;
}
}
if(!changed) {
return;
}
// Copy the allowed bit from the next segment's lanes to the current segment's matching lanes
for (int i = matchingIndex; i - matchingIndex < nextTurn.getLanes().length; i++) {
lanes[i] |= nextTurn.getLanes()[i - matchingIndex] & 1;
// set the allowed lane bit
for (int i = 0; i < lanes.length; i++) {
if(i >= activeIndex && i < activeIndex + activeLen) {
lanes[i] |= 1;
}
}
currentTurn.setLanes(lanes);
int turn = inferTurnFromLanes(lanes);

1
OsmAnd/src/net/osmand/plus/resources/ResourceManager.java
View file

@ -45,7 +45,6 @@ import net.osmand.plus.R;
import net.osmand.plus.SQLiteTileSource;
import net.osmand.plus.SearchByNameFilter;
import net.osmand.plus.Version;
import net.osmand.plus.download.BaseDownloadActivity;
import net.osmand.plus.render.MapRenderRepositories;
import net.osmand.plus.render.NativeOsmandLibrary;
import net.osmand.plus.resources.AsyncLoadingThread.MapLoadRequest;