move to profile params

GIScience · Oct 10, 2022 · 4e1ec3c · 4e1ec3c
1 parent 5938659
commit 4e1ec3c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,7 +37,7 @@ RELEASING:
 
 ## [6.7.1] - 2022-10-05
 ### Added
-- optional `encoder_options` parameter `force_turn_costs` ([#1220](https://github.com/GIScience/openrouteservice/pull/1220))
+- optional routing profile parameter `force_turn_costs` ([#1220](https://github.com/GIScience/openrouteservice/pull/1220))
 
 ## [6.7.0] - 2022-01-04
 ### Added

diff --git a/...service/src/main/java/org/heigit/ors/routing/configuration/RouteProfileConfiguration.java b/...service/src/main/java/org/heigit/ors/routing/configuration/RouteProfileConfiguration.java
@@ -85,7 +85,7 @@ public RouteProfileConfiguration(RouteProfileConfiguration rpc) {
 
 		encoderFlagsSize = rpc.encoderFlagsSize;
 		encoderOptions = rpc.encoderOptions;
-		enforceTurnCosts = hasEnforceTurnCosts(rpc.encoderOptions);
+		enforceTurnCosts = rpc.enforceTurnCosts;
 
 		isochronePreparationOpts = rpc.isochronePreparationOpts;
 		preparationOpts = rpc.preparationOpts;
@@ -216,15 +216,6 @@ public Double getMaximumDistanceDynamicWeights()
 	{
 		return maximumDistanceDynamicWeights;
 	}
-    private static boolean hasEnforceTurnCosts(String encoderOptions) {
-        for (String option : encoderOptions.split("\\|")) {
-            String[] keyValuePair = option.split("=");
-            if (keyValuePair.length > 0 && keyValuePair[0].equals("force_turn_costs")) {
-                return keyValuePair[1].equals("true");
-            }
-        }
-        return false;
-    }
 
 	public void setMaximumDistanceAvoidAreas(Double value)
 	{
@@ -274,7 +265,6 @@ public Integer getEncoderFlagsSize()
 	public void setEncoderOptions(String value)
 	{
 		encoderOptions = value;
-		enforceTurnCosts = hasEnforceTurnCosts(value);
 	}
 
 	public String getEncoderOptions()
@@ -417,6 +407,10 @@ public double getMaximumSpeedLowerBound(){
 		return maximumSpeedLowerBound;
 	}
 
+	public void setEnforceTurnCosts(boolean enforceTurnCosts) {
+		this.enforceTurnCosts = enforceTurnCosts;
+	}
+
 	public boolean isEnforceTurnCosts() {
 		return enforceTurnCosts;
 	}

diff --git a/...rvice/src/main/java/org/heigit/ors/routing/configuration/RoutingManagerConfiguration.java b/...rvice/src/main/java/org/heigit/ors/routing/configuration/RoutingManagerConfiguration.java
@@ -233,6 +233,9 @@ else if (defaultParams != null) {
 					case "traffic_expiration_min":
 						profile.setTrafficExpirationMin(Integer.parseInt(paramItem.getValue().toString()));
 						break;
+					case "force_turn_costs":
+						profile.setEnforceTurnCosts(Boolean.parseBoolean(paramItem.getValue().toString()));
+						break;
 					default:
 					}
 				}