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

fix time collection

Browse source
This commit is contained in:
sonora 2016-08-09 18:00:51 +02:00
parent ef66c4798d
commit 714d405e9c
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -1080,7 +1080,6 @@ public class RouteProvider {
}
Route route = new Route();
gpx.routes.add(route);
int collectedTime = 0;
for (int i = cDirInfo; i < directionInfo.size(); i++) {
RouteDirectionInfo dirInfo = directionInfo.get(i);
if (dirInfo.routePointOffset >= cRoute) {
@ -1090,17 +1089,18 @@ public class RouteProvider {
pt.lat = loc.getLatitude();
pt.lon = loc.getLongitude();
// Collect distances for subsequent suppressed turns
// Collect distances and times for subsequent suppressed turns
int collectedDistance = 0;
int collectedTime = 0;
for (int j = i + 1; j < directionInfo.size(); j++) {
if (directionInfo.get(j).getTurnType() != null && directionInfo.get(j).getTurnType().isSkipToSpeak()) {
collectedDistance += directionInfo.get(j).getDistance();
collectedTime += directionInfo.get(j).getExpectedTime();
} else {
break;
}
}
pt.desc = dirInfo.getDescriptionRoute(ctx, collectedDistance + dirInfo.getDistance());
Map<String, String> extensions = pt.getExtensionsToWrite();
extensions.put("time", (collectedTime + dirInfo.getExpectedTime()) + "");
collectedTime = 0;
@ -1123,8 +1123,6 @@ public class RouteProvider {
}
route.points.add(pt);
} else {
collectedTime += dirInfo.getExpectedTime();
}
}
}