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

take next name for roundabout (not roundabout name)

Browse source
This commit is contained in:
vshcherb 2013-08-23 16:11:52 +02:00
parent 9e43e5f9a2
commit 34d267ad56
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
View file

@ -246,14 +246,19 @@ public class RouteCalculationResult {
if(turn != null) {
RouteDirectionInfo info = new RouteDirectionInfo(s.getSegmentSpeed(), turn);
if(routeInd + 1< list.size()) {
RouteSegmentResult next = list.get(routeInd);
info.setRef(next.getObject().getRef());
info.setStreetName(next.getObject().getName());
info.setDestinationName(next.getObject().getDestinationName());
}
String description = toString(turn, ctx) + " " + RoutingHelper.formatStreetName(info.getStreetName(),
if (routeInd + 1 < list.size()) {
int lind = routeInd;
if(turn.isRoundAbout() && routeInd + 2 < list.size()) {
// take next name for roundabout (not roundabout name)
lind = routeInd + 1;
}
RouteSegmentResult next = list.get(lind);
info.setRef(next.getObject().getRef());
info.setStreetName(next.getObject().getName());
info.setDestinationName(next.getObject().getDestinationName());
}
String description = toString(turn, ctx) + " " + RoutingHelper.formatStreetName(info.getStreetName(),
info.getRef(), info.getDestinationName());
info.setDescriptionRoute(description);
info.routePointOffset = prevLocationSize;