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

Update progress

Browse source
This commit is contained in:
Victor Shcherb 2018-05-30 13:22:41 +02:00
parent e7c19ac764
commit dc14885f1f
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,4 +43,9 @@ public class RouteCalculationProgress {
} }
return Math.min(progress * 100f, 99); return Math.min(progress * 100f, 99);
} }
public void nextIteration() {
iteration++;
totalEstimatedDistance = 0;
}
} }

4
OsmAnd-java/src/net/osmand/router/RoutePlannerFrontEnd.java
View file

@ -176,7 +176,7 @@ public class RoutePlannerFrontEnd {
if (routeDirection != null) { if (routeDirection != null) {
ctx.precalculatedRouteDirection = routeDirection.adopt(ctx); ctx.precalculatedRouteDirection = routeDirection.adopt(ctx);
} }
ctx.calculationProgress.iteration++; ctx.calculationProgress.nextIteration();
List<RouteSegmentResult> res = runNativeRouting(ctx, recalculationEnd); List<RouteSegmentResult> res = runNativeRouting(ctx, recalculationEnd);
if (res != null) { if (res != null) {
new RouteResultPreparation().printResults(ctx, start, end, res); new RouteResultPreparation().printResults(ctx, start, end, res);
@ -199,7 +199,7 @@ public class RoutePlannerFrontEnd {
if (!addSegment(end, ctx, indexNotFound++, points)) { if (!addSegment(end, ctx, indexNotFound++, points)) {
return null; return null;
} }
ctx.calculationProgress.iteration++; ctx.calculationProgress.nextIteration();
List<RouteSegmentResult> res = searchRoute(ctx, points, routeDirection); List<RouteSegmentResult> res = searchRoute(ctx, points, routeDirection);
// make start and end more precise // make start and end more precise
makeStartEndPointsPrecise(res, start, end, intermediates); makeStartEndPointsPrecise(res, start, end, intermediates);