changes name for uniformity
This commit is contained in:
parent
c02e9cbae6
commit
eb413181d6
@ -193,8 +193,8 @@ public final class RoutingContext {
|
|||||||
public Integer startDirection;
|
public Integer startDirection;
|
||||||
public boolean startDirectionValid;
|
public boolean startDirectionValid;
|
||||||
public boolean forceUseStartDirection;
|
public boolean forceUseStartDirection;
|
||||||
public Integer roundtripDistance;
|
public Integer roundTripDistance;
|
||||||
public Integer roundtripDirectionAdd;
|
public Integer roundTripDirectionAdd;
|
||||||
public Integer roundTripPoints;
|
public Integer roundTripPoints;
|
||||||
public boolean allowSamewayback;
|
public boolean allowSamewayback;
|
||||||
|
|
||||||
|
|||||||
@ -489,9 +489,9 @@ public class RoutingEngine extends Thread {
|
|||||||
wpt1.name = "roundtrip";
|
wpt1.name = "roundtrip";
|
||||||
|
|
||||||
routingContext.useDynamicDistance = true;
|
routingContext.useDynamicDistance = true;
|
||||||
double searchRadius = (routingContext.roundtripDistance == null ? 1500 : routingContext.roundtripDistance);
|
double searchRadius = (routingContext.roundTripDistance == null ? 1500 : routingContext.roundTripDistance);
|
||||||
double direction = (routingContext.startDirection == null ? -1 : routingContext.startDirection);
|
double direction = (routingContext.startDirection == null ? -1 : routingContext.startDirection);
|
||||||
double directionAdd = (routingContext.roundtripDirectionAdd == null ? ROUNDTRIP_DEFAULT_DIRECTIONADD : routingContext.roundtripDirectionAdd);
|
double directionAdd = (routingContext.roundTripDirectionAdd == null ? ROUNDTRIP_DEFAULT_DIRECTIONADD : routingContext.roundTripDirectionAdd);
|
||||||
if (direction == -1) direction = getRandomDirectionByRouting(waypoints.get(0), searchRadius);
|
if (direction == -1) direction = getRandomDirectionByRouting(waypoints.get(0), searchRadius);
|
||||||
|
|
||||||
if (routingContext.allowSamewayback) {
|
if (routingContext.allowSamewayback) {
|
||||||
|
|||||||
@ -202,10 +202,10 @@ public class RoutingParamCollector {
|
|||||||
rctx.forceUseStartDirection = true;
|
rctx.forceUseStartDirection = true;
|
||||||
} else if (key.equals("direction")) {
|
} else if (key.equals("direction")) {
|
||||||
rctx.startDirection = Integer.valueOf(value);
|
rctx.startDirection = Integer.valueOf(value);
|
||||||
} else if (key.equals("roundtripDistance")) {
|
} else if (key.equals("roundTripDistance")) {
|
||||||
rctx.roundtripDistance = Integer.valueOf(value);
|
rctx.roundTripDistance = Integer.valueOf(value);
|
||||||
} else if (key.equals("roundtripDirectionAdd")) {
|
} else if (key.equals("roundTripDirectionAdd")) {
|
||||||
rctx.roundtripDirectionAdd = Integer.valueOf(value);
|
rctx.roundTripDirectionAdd = Integer.valueOf(value);
|
||||||
} else if (key.equals("roundTripPoints")) {
|
} else if (key.equals("roundTripPoints")) {
|
||||||
rctx.roundTripPoints = Integer.valueOf(value);
|
rctx.roundTripPoints = Integer.valueOf(value);
|
||||||
if (rctx.roundTripPoints == null || rctx.roundTripPoints < 3 || rctx.roundTripPoints > 20) {
|
if (rctx.roundTripPoints == null || rctx.roundTripPoints < 3 || rctx.roundTripPoints > 20) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user