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

Merge branch 'r3.3'

Browse source
This commit is contained in:
Victor Shcherb 2019-03-17 14:49:54 +01:00
commit 565cf8841d
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java
View file

@ -494,9 +494,7 @@ public class TransportRoutePlanner {
t += sts.getAvgStopIntervals()[k] * 10; t += sts.getAvgStopIntervals()[k] * 10;
} }
} else { } else {
if (t > 0) {
t += cfg.getBoardingTime(); t += cfg.getBoardingTime();
}
t += s.getTravelTime(); t += s.getTravelTime();
} }
} }

26
OsmAnd/src/net/osmand/plus/routepreparationmenu/RouteOptionsBottomSheet.java
View file

@ -350,12 +350,16 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
private List<LocalRoutingParameter> getRoutingParameters(ApplicationMode applicationMode) { private List<LocalRoutingParameter> getRoutingParameters(ApplicationMode applicationMode) {
List<String> routingParameters = new ArrayList<>(); List<String> routingParameters = new ArrayList<>();
if (applicationMode.equals(ApplicationMode.CAR)) { if (applicationMode.isDerivedRoutingFrom(ApplicationMode.CAR)) {
routingParameters = AppModeOptions.CAR.routingParameters; routingParameters = AppModeOptions.CAR.routingParameters;
} else if (applicationMode.equals(ApplicationMode.BICYCLE)) { } else if (applicationMode.isDerivedRoutingFrom(ApplicationMode.BICYCLE)) {
routingParameters = AppModeOptions.BICYCLE.routingParameters; routingParameters = AppModeOptions.BICYCLE.routingParameters;
} else if (applicationMode.equals(ApplicationMode.PEDESTRIAN)) { } else if (applicationMode.isDerivedRoutingFrom(ApplicationMode.PEDESTRIAN)) {
routingParameters = AppModeOptions.PEDESTRIAN.routingParameters; routingParameters = AppModeOptions.PEDESTRIAN.routingParameters;
} else if (applicationMode.isDerivedRoutingFrom(ApplicationMode.PUBLIC_TRANSPORT)) {
routingParameters = AppModeOptions.PUBLIC_TRANSPORT.routingParameters;
} else {
routingParameters = AppModeOptions.OTHER.routingParameters;
} }
return routingOptionsHelper.getRoutingParameters(applicationMode, routingParameters); return routingOptionsHelper.getRoutingParameters(applicationMode, routingParameters);
@ -472,6 +476,22 @@ public class RouteOptionsBottomSheet extends MenuBottomSheetDialogFragment {
DividerItem.KEY, DividerItem.KEY,
GpxLocalRoutingParameter.KEY, GpxLocalRoutingParameter.KEY,
OtherSettingsRoutingParameter.KEY, OtherSettingsRoutingParameter.KEY,
RouteSimulationItem.KEY),
PUBLIC_TRANSPORT(// MuteSoundRoutingParameter.KEY,
// DividerItem.KEY,
AvoidRoadsTypesRoutingParameter.KEY,
// ShowAlongTheRouteItem.KEY,
// DividerItem.KEY,
OtherSettingsRoutingParameter.KEY),
OTHER(MuteSoundRoutingParameter.KEY,
DividerItem.KEY,
AvoidRoadsRoutingParameter.KEY,
ShowAlongTheRouteItem.KEY,
DividerItem.KEY,
GpxLocalRoutingParameter.KEY,
OtherSettingsRoutingParameter.KEY,
RouteSimulationItem.KEY); RouteSimulationItem.KEY);