Merge branch 'release/5.1.1'

Author: jp-lopez

client-hc/pom.xml

@@ -27,7 +27,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>  
 
     <dependencies>

core/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
 
     <properties>

core/src/main/java/com/graphhopper/GraphHopperCustomSpeeds.java

@@ -73,9 +73,15 @@ private void setSpeedsFor(List<DecimalEncodedValue> speedEncoders) {
                 double customSpeed = maybeCustomSpeed.get();
                 if (customSpeed < maxSpeed) {
                     speedEncoders.forEach(encoder -> {
-                        double speed = iter.get(encoder);
-                        logger.debug("Replace " + speed + " with " + customSpeed + " for edge " + edge);
-                        iter.set(encoder, customSpeed);
+                        double maxEncoderValue = encoder.getMaxStorableDecimal();
+                        double minEncoderValue = encoder.getMinStorableDecimal();
+                        if(customSpeed <= maxEncoderValue && customSpeed >= minEncoderValue){
+                            double speed = iter.get(encoder);
+                            logger.debug("Replace " + speed + " with " + customSpeed + " for edge " + edge);
+                            iter.set(encoder, customSpeed);
+                        }else{
+                            logger.warn("Invalid Custom Speed (" + customSpeed + ")  for encoder " + encoder.getName() + " ( " + minEncoderValue + " - " + maxEncoderValue+ ") for edge " + edge + ",so it will be ignored");
+                        }
                     });
                 } else {
                     logger.warn("Custom Speed (" + customSpeed + ") > MaxSpeed ( " + maxSpeed + ") for edge " + edge + ",so it will be ignored");
@@ -93,9 +99,16 @@ private void setSpeedsFor(List<DecimalEncodedValue> speedEncoders) {
                 if (customSpeedReverse < maxSpeedReverse) {
                     speedEncoders.forEach(encoder -> {
                         if (encoder.isStoreTwoDirections()) {
-                            double speed = iter.getReverse(encoder);
-                            logger.debug("Replace " + speed + " with " + customSpeedReverse + " for edge reverse " + edge);
-                            iter.setReverse(encoder, customSpeedReverse);
+                            double maxEncoderValue = encoder.getMaxStorableDecimal();
+                            double minEncoderValue = encoder.getMinStorableDecimal();
+                            if(customSpeedReverse <= maxEncoderValue && customSpeedReverse >= minEncoderValue){
+                                double speed = iter.getReverse(encoder);
+                                logger.debug("Replace " + speed + " with " + customSpeedReverse + " for edge reverse " + edge);
+                                iter.setReverse(encoder, customSpeedReverse);
+                            }else{
+                                logger.warn("Invalid Custom Speed (" + customSpeedReverse + ") for encoder " + encoder.getName() + " ( " + minEncoderValue + " - " + maxEncoderValue+ ") for edge reverse " + edge + ",so it will be ignored");
+                            }
+
                         }
                     });
                 } else {

coverage/pom.xml

@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>com.stuart.platform.graphhopper</groupId>
             <artifactId>graphhopper-example</artifactId>
-            <version>5.1.0</version>
+            <version>5.1.1</version>
         </dependency>
         <dependency>
             <groupId>com.stuart.platform.graphhopper</groupId>

example/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>  
 
     <dependencies>

map-matching/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
 
     <dependencies>

navigation/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>  
 
     <dependencies>

pom.xml

@@ -5,7 +5,7 @@
     <groupId>com.stuart.platform.graphhopper</groupId>
     <artifactId>graphhopper-parent</artifactId>
     <name>GraphHopper Parent Project</name>
-    <version>5.1.0</version>
+    <version>5.1.1</version>
     <packaging>pom</packaging>
     <url>https://www.graphhopper.com</url>
     <inceptionYear>2012</inceptionYear>

reader-gtfs/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
 
     <dependencies>

tools/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
     <properties>
         <assembly-phase>package</assembly-phase>

web-api/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
 
     <dependencies>

web-bundle/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
 
     <dependencies>

web/pom.xml

@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.stuart.platform.graphhopper</groupId>
         <artifactId>graphhopper-parent</artifactId>
-        <version>5.1.0</version>
+        <version>5.1.1</version>
     </parent>
     <properties>
         <shade-phase>package</shade-phase>