Consider directional "maxspeed:hgv" OSM tags

Author: aoles

openrouteservice-api-tests/src/test/java/org/heigit/ors/v2/services/routing/ResultTest.java

@@ -3390,7 +3390,7 @@ public void expectZoneMaxpeed() {
         body.put("coordinates", coordinates);
         body.put("preference", getParameter("preference"));
 
-        // Test that "zone:maxspeed=DE:urban" overrides default "highway=residential" speed for both car and hgv
+        // Test that "zone:maxspeed = DE:urban" overrides default "highway = residential" speed for both car and hgv
         given()
                 .header("Accept", "application/json")
                 .header("Content-Type", "application/json")
@@ -3420,6 +3420,52 @@ public void expectZoneMaxpeed() {
                 .statusCode(200);
     }
 
+    @Test
+    public void expectMaxpeedHgvForward() {
+        JSONArray coordinates =  new JSONArray();
+        JSONArray coord1 = new JSONArray();
+        coord1.put(8.696237);
+        coord1.put(49.37186);
+        coordinates.put(coord1);
+        JSONArray coord2 = new JSONArray();
+        coord2.put(8.693427);
+        coord2.put(49.367914);
+        coordinates.put(coord2);
+
+        JSONObject body = new JSONObject();
+        body.put("coordinates", coordinates);
+        body.put("preference", getParameter("preference"));
+
+        // Test that "maxspeed:hgv:forward = 30" when going downhill on Am Götzenberg is taken into account for hgv profile
+        given()
+                .header("Accept", "application/json")
+                .header("Content-Type", "application/json")
+                .pathParam("profile", getParameter("carProfile"))
+                .body(body.toString())
+                .when()
+                .post(getEndPointPath() + "/{profile}")
+                .then()
+                .assertThat()
+                .body("any { it.key == 'routes' }", is(true))
+                .body("routes[0].summary.distance", is(497.5f))
+                .body("routes[0].summary.duration", is(61.9f))
+                .statusCode(200);
+
+        given()
+                .header("Accept", "application/json")
+                .header("Content-Type", "application/json")
+                .pathParam("profile", "driving-hgv")
+                .body(body.toString())
+                .when()
+                .post(getEndPointPath() + "/{profile}")
+                .then()
+                .assertThat()
+                .body("any { it.key == 'routes' }", is(true))
+                .body("routes[0].summary.distance", is(497.5f))
+                .body("routes[0].summary.duration", is(81.1f))
+                .statusCode(200);
+    }
+
     private JSONArray constructBearings(String coordString) {
         JSONArray coordinates = new JSONArray();
         String[] coordPairs = coordString.split("\\|");

openrouteservice/src/main/java/org/heigit/ors/routing/graphhopper/extensions/flagencoders/HeavyVehicleFlagEncoder.java

@@ -122,29 +122,27 @@ public void createEncodedValues(List<EncodedValue> registerNewEncodedValue, Stri
 
     @Override
     public double getMaxSpeed( ReaderWay way ) {
-        boolean bCheckMaxSpeed = false;
-        String maxspeedTag = way.getTag("maxspeed:hgv");
-        if (maxspeedTag == null) {
-            maxspeedTag = way.getTag("maxspeed");
-            bCheckMaxSpeed = true;
-        }
-
-        double maxSpeed = parseSpeed(maxspeedTag);
+        double maxSpeed = parseSpeed(way.getTag("maxspeed:hgv"));
 
-        double fwdSpeed = parseSpeed(way.getTag("maxspeed:forward"));
-        if (fwdSpeed >= 0 && (maxSpeed < 0 || fwdSpeed < maxSpeed))
+        double fwdSpeed = parseSpeed(way.getTag("maxspeed:hgv:forward"));
+        if (fwdSpeed >= 0.0D && (maxSpeed < 0.0D || fwdSpeed < maxSpeed)) {
             maxSpeed = fwdSpeed;
+        }
 
-        double backSpeed = parseSpeed(way.getTag("maxspeed:backward"));
-        if (backSpeed >= 0 && (maxSpeed < 0 || backSpeed < maxSpeed))
+        double backSpeed = parseSpeed(way.getTag("maxspeed:hgv:backward"));
+        if (backSpeed >= 0.0D && (maxSpeed < 0.0D || backSpeed < maxSpeed)) {
             maxSpeed = backSpeed;
+        }
 
-        if (bCheckMaxSpeed) {
-            String highway = way.getTag(KEY_HIGHWAY);
-            if (!Helper.isEmpty(highway)) {
-                double defaultSpeed = speedLimitHandler.getSpeed(highway);
-                if (defaultSpeed < maxSpeed)
-                    maxSpeed = defaultSpeed;
+        if (maxSpeed < 0.0D) {
+            maxSpeed = super.getMaxSpeed(way);
+            if (maxSpeed >= 0.0D) {
+                String highway = way.getTag(KEY_HIGHWAY);
+                if (!Helper.isEmpty(highway)) {
+                    double defaultSpeed = speedLimitHandler.getSpeed(highway);
+                    if (defaultSpeed < maxSpeed)
+                        maxSpeed = defaultSpeed;
+                }
             }
         }