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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-04-27 01:06:03 +02:00
commit a5f602c2ec
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ import net.osmand.data.LatLon;
import net.osmand.router.BinaryRoutePlanner.FinalRouteSegment;
import net.osmand.router.BinaryRoutePlanner.RouteSegment;
import net.osmand.router.RoutePlannerFrontEnd.RouteCalculationMode;
import net.osmand.util.Algorithms;
import net.osmand.util.MapUtils;
import org.apache.commons.logging.Log;
@ -440,6 +441,10 @@ public class RouteResultPreparation {
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())) {
ut = false;
}
if (ut) {
tnext.setSkipToSpeak(true);
if (tl && TurnType.isLeftTurnNoUTurn(tnext.getValue())) {