Check that we do not exceed the initial calculated maximum speed limit with our boosting.

-> now the previously commented test case can be enabled.
Additional a test for exceeding maximum negative boosting added.

Author: ratrun

core/src/main/java/com/graphhopper/routing/util/BikeFlagEncoder.java

@@ -44,6 +44,8 @@ public class BikeFlagEncoder extends AbstractFlagEncoder
     private HashSet<String> wheeler = new HashSet<String>();
     private HashSet<String> intended = new HashSet<String>();
     private HashSet<String> oppositeLanes = new HashSet<String>();
+    
+    private int maxcyclespeed = 30;
 
     /**
      * Should be only instantied via EncodingManager
@@ -95,8 +97,9 @@ public int defineBits( int index, int shift )
     {
         // first two bits are reserved for route handling in superclass
         shift = super.defineBits(index, shift);
+        maxcyclespeed=relationWeightCodeToSpeed(20, relationMapCode.OUTSTANDING_NICE.getValue());
 
-        speedEncoder = new EncodedValue("Speed", shift, 4, 2, HIGHWAY_SPEED.get("cycleway"), relationWeightCodeToSpeed(20, relationMapCode.OUTSTANDING_NICE.getValue()));
+        speedEncoder = new EncodedValue("Speed", shift, 4, 2, HIGHWAY_SPEED.get("cycleway"), maxcyclespeed);
 
         shift += 4;
 
@@ -206,7 +209,14 @@ private int relationWeightCodeToSpeed(int highwayspeed, int relationweightcode)
         else 
            speed=highwayspeed; 
         // Add or remove 3km/h per every relation weight boost point
-        return  speed + 3 * (relationweightcode-unspecifiedRelationWeight);
+        speed = speed + 3 * (relationweightcode-unspecifiedRelationWeight);
+        // Make sure that we do not eceed the limits:
+        if (speed > maxcyclespeed)
+            speed = maxcyclespeed;
+        else
+            if (speed <0)
+              speed = 0;
+        return speed ;
     }
 
     @Override

core/src/test/java/com/graphhopper/routing/util/BikeFlagEncoderTest.java

@@ -286,11 +286,13 @@ public void testhandleWayTags()
         flags=encoder.handleWayTags( allowed,  way, 7 );
         assertEquals(755, flags);
 
-        /* This throws an exception, but boosting with 8 is an error  as it is higher than OUTSTANDING_NICE
         allowed=1;
-        flags=encoder.handleWayTags( allowed,  way, 8 );
-        assertEquals(127, flags);
-        */
+        flags=encoder.handleWayTags( allowed,  way, 18 );
+        assertEquals(763, flags);
+
+        allowed=1;
+        flags=encoder.handleWayTags( allowed,  way, -18 );
+        assertEquals(707, flags);
 
 
     }