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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-12-16 21:10:57 +01:00
commit d005740da7
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd-java/src/net/osmand/router/GeneralRouter.java
View file

@ -87,7 +87,8 @@ public class GeneralRouter implements VehicleRouter {
public enum GeneralRouterProfile { public enum GeneralRouterProfile {
CAR, CAR,
PEDESTRIAN, PEDESTRIAN,
BICYCLE BICYCLE,
BOAT
} }

4
OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
View file

@ -728,6 +728,8 @@ public class RouteProvider {
p = GeneralRouterProfile.PEDESTRIAN; p = GeneralRouterProfile.PEDESTRIAN;
} else if(params.mode.isDerivedRoutingFrom(ApplicationMode.CAR)){ } else if(params.mode.isDerivedRoutingFrom(ApplicationMode.CAR)){
p = GeneralRouterProfile.CAR; p = GeneralRouterProfile.CAR;
} else if (params.mode.isDerivedRoutingFrom(ApplicationMode.BOAT)) {
p = GeneralRouterProfile.BOAT;
} else { } else {
return null; return null;
} }
@ -830,7 +832,7 @@ public class RouteProvider {
} }
private RouteCalculationResult applicationModeNotSupported(RouteCalculationParams params) { private RouteCalculationResult applicationModeNotSupported(RouteCalculationParams params) {
return new RouteCalculationResult("Application mode '"+ params.mode.toHumanStringCtx(params.ctx)+ "'is not supported."); return new RouteCalculationResult("Application mode '"+ params.mode.toHumanStringCtx(params.ctx)+ "' is not supported.");
} }
private RouteCalculationResult interrupted() { private RouteCalculationResult interrupted() {