Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d511e7c103
2 changed files with 2 additions and 2 deletions
|
@ -474,7 +474,7 @@ public class TargetPointsHelper {
|
|||
|
||||
|
||||
public boolean hasTooLongDistanceToNavigate() {
|
||||
if(settings.ROUTER_SERVICE.get() != RouteService.OSMAND) {
|
||||
if(settings.ROUTER_SERVICE.getModeValue(routingHelper.getAppMode()) != RouteService.OSMAND) {
|
||||
return false;
|
||||
}
|
||||
Location current = routingHelper.getLastProjection();
|
||||
|
|
|
@ -700,7 +700,7 @@ public class RoutePreferencesMenu {
|
|||
private List<LocalRoutingParameter> getRoutingParametersInner(ApplicationMode am) {
|
||||
List<LocalRoutingParameter> list = new ArrayList<LocalRoutingParameter>();
|
||||
RouteProvider.GPXRouteParamsBuilder rparams = mapActivity.getRoutingHelper().getCurrentGPXRoute();
|
||||
boolean osmandRouter = settings.ROUTER_SERVICE.get() == RouteProvider.RouteService.OSMAND;
|
||||
boolean osmandRouter = settings.ROUTER_SERVICE.getModeValue(am) == RouteProvider.RouteService.OSMAND;
|
||||
if (!osmandRouter) {
|
||||
list.add(new OtherLocalRoutingParameter(R.string.calculate_osmand_route_without_internet,
|
||||
getString(R.string.calculate_osmand_route_without_internet), settings.GPX_ROUTE_CALC_OSMAND_PARTS
|
||||
|
|
Loading…
Reference in a new issue