bedroomghost/brouter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved roundTripPoints to internal vars

Browse Source
This commit is contained in:
afischerdev 2025-02-26 17:32:44 +01:00
parent e19101ee26
commit c509fb280b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
brouter-core/src/main/java/btools/router/RoutingContext.java
View File

@ -77,7 +77,6 @@ public final class RoutingContext {
public boolean correctMisplacedViaPoints; public boolean correctMisplacedViaPoints;
public double correctMisplacedViaPointsDistance; public double correctMisplacedViaPointsDistance;
public boolean useDynamicDistance; public boolean useDynamicDistance;
public int roundTripPoints;
private void setModel(String className) { private void setModel(String className) {
if (className == null) { if (className == null) {
@ -172,11 +171,6 @@ public final class RoutingContext {
useDynamicDistance = expctxGlobal.getVariableValue("use_dynamic_range", 0f) == 1f; useDynamicDistance = expctxGlobal.getVariableValue("use_dynamic_range", 0f) == 1f;
roundTripPoints = (int) expctxGlobal.getVariableValue("roundTripPoints", 5.f);
if (roundTripPoints < 3 || roundTripPoints > 20) {
roundTripPoints = 5;
}
boolean test = expctxGlobal.getVariableValue("check_start_way", 1f) == 1f; boolean test = expctxGlobal.getVariableValue("check_start_way", 1f) == 1f;
if (!test) freeNoWays(); if (!test) freeNoWays();
@ -199,6 +193,7 @@ public final class RoutingContext {
public boolean forceUseStartDirection; public boolean forceUseStartDirection;
public Integer roundtripDistance; public Integer roundtripDistance;
public Integer roundtripDirectionAdd; public Integer roundtripDirectionAdd;
public Integer roundTripPoints;
public boolean allowSamewayback; public boolean allowSamewayback;
public CheapAngleMeter anglemeter = new CheapAngleMeter(); public CheapAngleMeter anglemeter = new CheapAngleMeter();

5
brouter-core/src/main/java/btools/router/RoutingParamCollector.java
View File

@ -206,6 +206,11 @@ public class RoutingParamCollector {
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")) {
rctx.roundTripPoints = Integer.valueOf(value);
if (rctx.roundTripPoints == null || rctx.roundTripPoints < 3 || rctx.roundTripPoints > 20) {
rctx.roundTripPoints = 5;
}
} else if (key.equals("allowSamewayback")) { } else if (key.equals("allowSamewayback")) {
rctx.allowSamewayback = Integer.parseInt(value)==1; rctx.allowSamewayback = Integer.parseInt(value)==1;
} else if (key.equals("alternativeidx")) { } else if (key.equals("alternativeidx")) {