From eb413181d6b8e1f883162fcaa34a8f6892afac37 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Fri, 28 Feb 2025 14:31:05 +0100 Subject: [PATCH] changes name for uniformity --- .../src/main/java/btools/router/RoutingContext.java | 4 ++-- .../src/main/java/btools/router/RoutingEngine.java | 4 ++-- .../main/java/btools/router/RoutingParamCollector.java | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/RoutingContext.java b/brouter-core/src/main/java/btools/router/RoutingContext.java index 1ba7481..bc8706e 100644 --- a/brouter-core/src/main/java/btools/router/RoutingContext.java +++ b/brouter-core/src/main/java/btools/router/RoutingContext.java @@ -193,8 +193,8 @@ public final class RoutingContext { public Integer startDirection; public boolean startDirectionValid; public boolean forceUseStartDirection; - public Integer roundtripDistance; - public Integer roundtripDirectionAdd; + public Integer roundTripDistance; + public Integer roundTripDirectionAdd; public Integer roundTripPoints; public boolean allowSamewayback; diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java index fd318e7..2fd7100 100644 --- a/brouter-core/src/main/java/btools/router/RoutingEngine.java +++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java @@ -489,9 +489,9 @@ public class RoutingEngine extends Thread { wpt1.name = "roundtrip"; 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 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 (routingContext.allowSamewayback) { diff --git a/brouter-core/src/main/java/btools/router/RoutingParamCollector.java b/brouter-core/src/main/java/btools/router/RoutingParamCollector.java index 05dab70..f239315 100644 --- a/brouter-core/src/main/java/btools/router/RoutingParamCollector.java +++ b/brouter-core/src/main/java/btools/router/RoutingParamCollector.java @@ -202,10 +202,10 @@ public class RoutingParamCollector { rctx.forceUseStartDirection = true; } else if (key.equals("direction")) { rctx.startDirection = Integer.valueOf(value); - } else if (key.equals("roundtripDistance")) { - rctx.roundtripDistance = Integer.valueOf(value); - } else if (key.equals("roundtripDirectionAdd")) { - rctx.roundtripDirectionAdd = Integer.valueOf(value); + } else if (key.equals("roundTripDistance")) { + rctx.roundTripDistance = Integer.valueOf(value); + } else if (key.equals("roundTripDirectionAdd")) { + rctx.roundTripDirectionAdd = Integer.valueOf(value); } else if (key.equals("roundTripPoints")) { rctx.roundTripPoints = Integer.valueOf(value); if (rctx.roundTripPoints == null || rctx.roundTripPoints < 3 || rctx.roundTripPoints > 20) {