Merge branch 'master' into bugfix#939-use_speed_limit_definitions_from_json_files

Author: takb

CHANGELOG.md

@@ -38,6 +38,7 @@ RELEASING:
 - Time-dependent core-based routing algorithms
 - Option to disable edge-based routing in core for a single weighting ([#928](https://github.com/GIScience/openrouteservice/issues/928))
 ### Fixed
+- Do not consider ill-defined "maxspeed = 0" OSM tags ([#940](https://github.com/GIScience/openrouteservice/issues/940))
 - Use JSON definitions of country-specific speed limits ([#939](https://github.com/GIScience/openrouteservice/issues/939))
 - Config file parameter to set the number of active landmarks for core routing ([#930](https://github.com/GIScience/openrouteservice/issues/930))
 - Make sure A* with beeline approximation is used as default fallback algorithm ([#926](https://github.com/GIScience/openrouteservice/issues/926))

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

@@ -370,6 +370,12 @@ protected String getHighway(ReaderWay way) {
         return highwayValue;
     }
 
+    @Override
+    protected double applyMaxSpeed(ReaderWay way, double speed) {
+        double maxSpeed = this.getMaxSpeed(way);
+        return maxSpeed > 0.0D ? maxSpeed * 0.9D : speed;
+    }
+
     /**
      * @param way:   needed to retrieve tags
      * @param speed: speed guessed e.g. from the road type or other tags

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

@@ -395,7 +395,7 @@ public long handleRelationTags(long oldRelationFlags, ReaderRelation relation) {
     @Override
     protected double applyMaxSpeed(ReaderWay way, double speed) {
         double maxSpeed = getMaxSpeed(way);
-        if (maxSpeed >= 0 && maxSpeed < speed) {
+        if (maxSpeed > 0 && maxSpeed < speed) {
             return maxSpeed;
         }
         return speed;