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

Back out Issue 2515 test code, no effect on bug it looks like

Browse source
This commit is contained in:
sonora 2015-01-10 12:31:52 +01:00
parent 1c9e59a8cc
commit 39520c09aa
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -778,11 +778,11 @@ public class RoutingHelper {
public void recalculateRouteDueToSettingsChange() {
//This should fix route-recalculation if settings change during ongoing calculation
clearCurrentRoute(finalLocation, intermediatePoints);
// Try re-initialize start point to check impact on Issue 2515
if (settings.getPointToStart() != null) {
lastFixedLocation.setLatitude(settings.getPointToStart().getLatitude());
lastFixedLocation.setLongitude(settings.getPointToStart().getLongitude());
}
//Test only: Try re-initialize start point to check impact on Issue 2515
//if (settings.getPointToStart() != null) {
// lastFixedLocation.setLatitude(settings.getPointToStart().getLatitude());
// lastFixedLocation.setLongitude(settings.getPointToStart().getLongitude());
//}
recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false);
}

7
OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java
View file

@ -79,16 +79,13 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
getTargets().navigateToPoint(latlon, true, -1);
} else {
getTargets().setStartPoint(latlon, true, null);
//TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.)
//TODO: Issue 2515: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.)
}
contextMenu.setLocation(latlon, null);
showDialog();
//-Test code only--
//Try force resuming route re-caculation if stopped due to Issue2515
//Test code: Try force resuming route re-caculation here if stopped due to Issue 2515
// interesting: putting one or more of the next lines here destroys the alternating "interrupted route calculation won't re-start" behavior and causes the route calculation to NEVER re-start!
//routingHelper.recalculateRouteDueToSettingsChange();
//routingHelper.recalculateRouteDueToSettingsChange();
//-----------------
return true;
}
return super.onSingleTap(point, tileBox);