Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-04-16 12:13:12 +02:00
commit 76d7f63b4e

View file

@ -1092,7 +1092,8 @@ public class RouteProvider {
for (int i = cDirInfo; i < directionInfo.size(); i++) { for (int i = cDirInfo; i < directionInfo.size(); i++) {
RouteDirectionInfo dirInfo = directionInfo.get(i); RouteDirectionInfo dirInfo = directionInfo.get(i);
if (dirInfo.routePointOffset - routePointOffsetAdjusted >= cRoute) { if (dirInfo.routePointOffset - routePointOffsetAdjusted >= cRoute) {
if (dirInfo.getTurnType() != null && !dirInfo.getTurnType().isSkipToSpeak()) { if (dirInfo.getTurnType() != null && !dirInfo.getTurnType().isSkipToSpeak() &&
dirInfo.routePointOffset - routePointOffsetAdjusted < routeNodes.size()) {
Location loc = routeNodes.get(dirInfo.routePointOffset - routePointOffsetAdjusted); Location loc = routeNodes.get(dirInfo.routePointOffset - routePointOffsetAdjusted);
WptPt pt = new WptPt(); WptPt pt = new WptPt();
pt.lat = loc.getLatitude(); pt.lat = loc.getLatitude();