Increase priority level by one step in case of scenic=yes tag.

Triggered by graphhopper#571.

Author: ratrun

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

@@ -573,6 +573,13 @@ void collect( OSMWay way, TreeMap<Double, Integer> weightToPrioMap )
             if (classBicycle != null)
                 weightToPrioMap.put(100d, convertClassValueToPriority(classBicycle).getValue());
         }
+
+        if (way.hasTag("scenic", "yes"))
+        {
+            if (weightToPrioMap.lastEntry().getValue() < BEST.getValue() )
+            // Increase the prio by one step
+            weightToPrioMap.put(110d,  weightToPrioMap.lastEntry().getValue() + 1);
+        }
     }
 
     /**

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

@@ -50,6 +50,10 @@ public void testGetSpeed()
         assertEquals(18, encoder.getSpeed(way));
         assertPriority(REACH_DEST.getValue(), way);
 
+        way.setTag("scenic", "yes");
+        assertEquals(18, encoder.getSpeed(way));
+        assertPriority(AVOID_IF_POSSIBLE.getValue(), way);
+
         // Pushing section !! This is fine as we obey the law!
         way.clearTags();
         way.setTag("highway", "footway");
@@ -517,6 +521,10 @@ public void testClassBicycle()
         way.setTag("highway", "tertiary");
         way.setTag("class:bicycle", "3");
         assertPriority(BEST.getValue(), way);
+        // Test that priority cannot get better than best
+        way.setTag("scenic", "yes");
+        assertPriority(BEST.getValue(), way);
+        way.setTag("scenic", "no");
         way.setTag("class:bicycle", "2");
         assertPriority(VERY_NICE.getValue(), way);
         way.setTag("class:bicycle", "1");