fix: rename MatrixService.uTurnCost back to uTurnCosts

The previous renaming was done by accident.
GIScience · Nov 26, 2024 · 5704696 · 5704696
1 parent 2c248bb
commit 5704696
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/docs/run-instance/configuration/endpoints/matrix.md b/docs/run-instance/configuration/endpoints/matrix.md
@@ -11,4 +11,4 @@ Settings for the matrix endpoint.
 | maximum_routes_flexible | number  | Maximum amount of routes for profiles that do not have the CH routing algorithm enabled                                          | `25`                                               |
 | maximum_visited_nodes   | number  | Maximum allowed number of visited nodes in shortest path computation                                                             | `100000`                                           |
 | maximum_search_radius   | number  | Maximum allowed distance in meters between the requested coordinate and a point on the nearest road                              | `2000`                                             |
-| u_turn_cost             | number  | Penalty of performing a U-Turn; the value of `-1` prevents them entirely                                                         | `-1`                                               |
+| u_turn_costs            | number  | Penalty of performing a U-Turn; the value of `-1` prevents them entirely                                                         | `-1`                                               |
diff --git a/ors-api/src/main/java/org/heigit/ors/api/config/EndpointsProperties.java b/ors-api/src/main/java/org/heigit/ors/api/config/EndpointsProperties.java
@@ -54,7 +54,7 @@ public static class EndpointMatrixProperties {
         private int maximumRoutesFlexible;
         private int maximumVisitedNodes;
         private double maximumSearchRadius;
-        private double uTurnCost;
+        private double uTurnCosts;
 
         public int getMaximumRoutes(boolean flexible) {
             return (flexible ? maximumRoutesFlexible : maximumRoutes);

diff --git a/ors-api/src/main/java/org/heigit/ors/api/services/MatrixService.java b/ors-api/src/main/java/org/heigit/ors/api/services/MatrixService.java
@@ -56,7 +56,7 @@ public org.heigit.ors.matrix.MatrixRequest convertMatrixRequest(MatrixRequest ma
         org.heigit.ors.matrix.MatrixRequest coreRequest = new org.heigit.ors.matrix.MatrixRequest(
                 endpointsProperties.getMatrix().getMaximumSearchRadius(),
                 endpointsProperties.getMatrix().getMaximumVisitedNodes(),
-                endpointsProperties.getMatrix().getUTurnCost());
+                endpointsProperties.getMatrix().getUTurnCosts());
 
         coreRequest.setProfileName(matrixRequest.getProfileName());
         String[] sources = matrixRequest.getSources();

diff --git a/ors-api/src/main/resources/application.yml b/ors-api/src/main/resources/application.yml
@@ -77,7 +77,7 @@ ors:
       maximum_routes_flexible: 25
       maximum_visited_nodes: 100000
       maximum_search_radius: 2000
-      u_turn_cost: -1
+      u_turn_costs: -1
     isochrones:
       enabled: true
       attribution: openrouteservice.org, OpenStreetMap contributors

diff --git a/ors-api/src/test/java/org/heigit/ors/api/services/MatrixServiceTest.java b/ors-api/src/test/java/org/heigit/ors/api/services/MatrixServiceTest.java
@@ -87,7 +87,7 @@ void setUp() {
         matrixRequest = new MatrixRequest(
                 endpointsProperties.getMatrix().getMaximumSearchRadius(),
                 endpointsProperties.getMatrix().getMaximumVisitedNodes(),
-                endpointsProperties.getMatrix().getUTurnCost());
+                endpointsProperties.getMatrix().getUTurnCosts());
         matrixRequest.setResolveLocations(true);
         matrixRequest.setMetrics(MatrixMetricsType.DURATION);
         matrixRequest.setSources(coordinates);
@@ -98,7 +98,7 @@ void setUp() {
         bareMatrixRequest = new MatrixRequest(
                 endpointsProperties.getMatrix().getMaximumSearchRadius(),
                 endpointsProperties.getMatrix().getMaximumVisitedNodes(),
-                endpointsProperties.getMatrix().getUTurnCost());
+                endpointsProperties.getMatrix().getUTurnCosts());
         bareMatrixRequest.setSources(coordinates);
         bareMatrixRequest.setDestinations(coordinates);