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

Fix exception

Browse source
This commit is contained in:
Victor Shcherb 2020-07-09 14:01:43 +02:00
parent 64c9fd702e
commit 2db3b07225
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,6 +228,8 @@ public class RoutePlannerFrontEnd {
routeFound = findGpxRouteSegment(gctx, gpxPoints, start, next, prev != null); routeFound = findGpxRouteSegment(gctx, gpxPoints, start, next, prev != null);
if (routeFound) { if (routeFound) {
// route is found - cut the end of the route and move to next iteration // route is found - cut the end of the route and move to next iteration
// start.stepBackRoute = new ArrayList<RouteSegmentResult>();
// boolean stepBack = true;
boolean stepBack = stepBackAndFindPrevPointInRoute(gctx, gpxPoints, start, next); boolean stepBack = stepBackAndFindPrevPointInRoute(gctx, gpxPoints, start, next);
if (!stepBack) { if (!stepBack) {
// not supported case (workaround increase MAXIMUM_STEP_APPROXIMATION) // not supported case (workaround increase MAXIMUM_STEP_APPROXIMATION)
@ -518,9 +520,12 @@ public class RoutePlannerFrontEnd {
// make first position precise // make first position precise
makeSegmentPointPrecise(res.get(0), start.loc, true); makeSegmentPointPrecise(res.get(0), start.loc, true);
} else { } else {
assert res.get(0).getObject().getId() == start.pnt.getRoad().getId(); if(res.get(0).getObject().getId() == start.pnt.getRoad().getId()) {
// start point could shift to +-1 due to direction // start point could shift to +-1 due to direction
res.get(0).setStartPointIndex(start.pnt.getSegmentStart()); res.get(0).setStartPointIndex(start.pnt.getSegmentStart());
} else {
//throw new IllegalStateException("TODO");
}
} }
start.routeToTarget = res; start.routeToTarget = res;
start.targetInd = target.ind; start.targetInd = target.ind;