fix: decouple vehicle parameters from vehicle type (#2073)

Author: aoles

CHANGELOG.md

@@ -44,6 +44,7 @@ Releasing is documented in RELEASE.md
 - bump deprecated CodeQL and failing Grype scan GitHub actions to their current versions ([#2061](https://github.com/GIScience/openrouteservice/pull/2061))
 - avoid routing on roads with access reserved to customers ([#2060](https://github.com/GIScience/openrouteservice/pull/2060))
 - required dynamic weights for driving-hgv with `hazmat` `false` or other default Vehicle init values ([#2071](https://github.com/GIScience/openrouteservice/pull/2071))
+- enable setting vehicle parameters without the need of specifying vehicle type ([#2073](https://github.com/GIScience/openrouteservice/pull/2073))
 
 ### Security
 

ors-api/src/main/java/org/heigit/ors/api/services/ApiService.java

@@ -223,12 +223,9 @@ protected ProfileParameters convertParameters(RequestOptions options, int profil
         }
 
         if (options.getProfileParams().hasRestrictions()) {
-
             RequestProfileParamsRestrictions restrictions = options.getProfileParams().getRestrictions();
-            APIEnums.VehicleType vehicleType = options.getVehicleType();
-
             validateRestrictionsForProfile(restrictions, profileType);
-            params = convertSpecificProfileParameters(profileType, restrictions, vehicleType);
+            params = convertSpecificProfileParameters(profileType, restrictions);
         }
 
         if (options.getProfileParams().hasWeightings()) {
@@ -247,28 +244,26 @@ protected ProfileParameters convertParameters(RequestOptions options, int profil
         return params;
     }
 
-    protected ProfileParameters convertSpecificProfileParameters(int profileType, RequestProfileParamsRestrictions restrictions, APIEnums.VehicleType vehicleType) {
+    protected ProfileParameters convertSpecificProfileParameters(int profileType, RequestProfileParamsRestrictions restrictions) {
         ProfileParameters params = new ProfileParameters();
         if (RoutingProfileType.isHeavyVehicle(profileType))
-            params = convertHeavyVehicleParameters(restrictions, vehicleType);
+            params = convertHeavyVehicleParameters(restrictions);
         if (RoutingProfileType.isWheelchair(profileType))
             params = convertWheelchairParamRestrictions(restrictions);
         return params;
     }
 
-    private VehicleParameters convertHeavyVehicleParameters(RequestProfileParamsRestrictions restrictions, APIEnums.VehicleType vehicleType) {
+    private VehicleParameters convertHeavyVehicleParameters(RequestProfileParamsRestrictions restrictions) {
 
         VehicleParameters params = new VehicleParameters();
 
-        if (vehicleType != null && vehicleType != APIEnums.VehicleType.UNKNOWN) {
-            setLengthParam(restrictions, params);
-            setWidthParam(restrictions, params);
-            setHeightParam(restrictions, params);
-            setWeightParam(restrictions, params);
-            setAxleLoadParam(restrictions, params);
+        setLengthParam(restrictions, params);
+        setWidthParam(restrictions, params);
+        setHeightParam(restrictions, params);
+        setWeightParam(restrictions, params);
+        setAxleLoadParam(restrictions, params);
 
-            setLoadCharacteristicsParam(restrictions, params);
-        }
+        setLoadCharacteristicsParam(restrictions, params);
 
         return params;
     }

ors-api/src/test/java/org/heigit/ors/api/services/APIServiceTest.java

@@ -193,7 +193,7 @@ void convertParameters() throws StatusCodeException {
     void convertSpecificProfileParameters() {
         RequestProfileParamsRestrictions restrictions = new RequestProfileParamsRestrictions();
         restrictions.setHeight(10.0f);
-        ProfileParameters params = apiService.convertSpecificProfileParameters(2, restrictions, APIEnums.VehicleType.HGV);
+        ProfileParameters params = apiService.convertSpecificProfileParameters(2, restrictions);
         assertTrue(params instanceof VehicleParameters);
         assertEquals(10.0f, ((VehicleParameters) params).getHeight(), 0.0);
     }

ors-api/src/test/java/org/heigit/ors/apitests/routing/ResultTest.java

@@ -1217,7 +1217,6 @@ void testTollwaysExtraDetails() {
         params.put("restrictions", restrictions);
         JSONObject options = new JSONObject();
         options.put("profile_params", params);
-        options.put("vehicle_type", "hgv");
         body.put("options", options);
         body.put("continue_straight", false);
 
@@ -1676,7 +1675,6 @@ void testVehicleType() {
         body.put("units", "m");
 
         JSONObject options = new JSONObject();
-        options.put("vehicle_type", "hgv");
         body.put("options", options);
 
         // Test that buses are not allowed on Neue Schlossstraße (https://www.openstreetmap.org/way/150549948)
@@ -1718,7 +1716,6 @@ void testHGVDelivery() {
         body.put("units", "m");
 
         JSONObject options = new JSONObject();
-        options.put("vehicle_type", "hgv");
         body.put("options", options);
 
         given()
@@ -1763,7 +1760,6 @@ void testHGVWidthRestriction() { // check route
         params.put("restrictions", restrictions);
         JSONObject options = new JSONObject();
         options.put("profile_params", params);
-        options.put("vehicle_type", "hgv");
         body.put("options", options);
 
         given()
@@ -1786,7 +1782,6 @@ void testHGVWidthRestriction() { // check route
         params.put("restrictions", restrictions);
         options = new JSONObject();
         options.put("profile_params", params);
-        options.put("vehicle_type", "hgv");
         body.put("options", options);
 
         given()
@@ -1818,7 +1813,6 @@ void testHGVHeightRestriction() {
         params.put("restrictions", restrictions);
         JSONObject options = new JSONObject();
         options.put("profile_params", params);
-        options.put("vehicle_type", "hgv");
         body.put("options", options);
 
         given()
@@ -1841,7 +1835,6 @@ void testHGVHeightRestriction() {
         params.put("restrictions", restrictions);
         options = new JSONObject();
         options.put("profile_params", params);
-        options.put("vehicle_type", "hgv");
         body.put("options", options);
 
         given()
@@ -1873,7 +1866,6 @@ void testHGVHazmatRestriction() {
         params.put("restrictions", restrictions);
         JSONObject options = new JSONObject();
         options.put("profile_params", params);
-        options.put("vehicle_type", "hgv");
         body.put("options", options);
 
         given()