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

Add params

Browse source
This commit is contained in:
Victor Shcherb 2019-06-25 16:15:34 +02:00
parent 92ebc7380e
commit e0878f4f04
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,8 @@ public class GeneralRouter implements VehicleRouter {
public static final String ALLOW_PRIVATE = "allow_private";
public static final String ALLOW_MOTORWAYS = "allow_motorway";
public static final String DEFAULT_SPEED = "default_speed";
public static final String MIN_SPEED = "min_speed";
public static final String MAX_SPEED = "max_speed";
private final RouteAttributeContext[] objectAttributes;
public final Map<String, String> attributes;
@ -62,8 +64,6 @@ public class GeneralRouter implements VehicleRouter {
// speed in m/s
private float maxSpeed = 10f;
private float defaultSpeedRatio = 1f;
private TLongHashSet impassableRoads;
private GeneralRouterProfile profile;
@ -168,9 +168,14 @@ public class GeneralRouter implements VehicleRouter {
if(shortestRoute) {
maxSpeed = Math.min(CAR_SHORTEST_DEFAULT_SPEED, maxSpeed);
}
float userDefinedDefSpeed = params.containsKey(DEFAULT_SPEED) ? parseSilentFloat(params.get(DEFAULT_SPEED), defaultSpeed) : defaultSpeed;
if (userDefinedDefSpeed != defaultSpeed) {
defaultSpeedRatio = userDefinedDefSpeed / defaultSpeed;
if (params.containsKey(DEFAULT_SPEED)) {
defaultSpeed = parseSilentFloat(params.get(DEFAULT_SPEED), defaultSpeed);
}
if (params.containsKey(MIN_SPEED)) {
minSpeed = parseSilentFloat(params.get(MIN_SPEED), minSpeed);
}
if (params.containsKey(MAX_SPEED)) {
maxSpeed = parseSilentFloat(params.get(MAX_SPEED), maxSpeed);
}
}
@ -405,7 +410,7 @@ public class GeneralRouter implements VehicleRouter {
@Override
public float getDefaultSpeed() {
return defaultSpeed * defaultSpeedRatio;
return defaultSpeed;
}
@Override