Roundabout tags for foot and bike flag encoder

Author: jansoe

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

@@ -313,6 +313,12 @@ public long handleWayTags( OSMWay way, long allowed, long relationFlags )
             encoded = handleSpeed(way, speed, encoded);
             encoded = handleBikeRelated(way, encoded, relationFlags > UNCHANGED.getValue());
 
+            boolean isRoundabout = way.hasTag("junction", "roundabout");
+            if (isRoundabout)
+            {
+                encoded = setBool(encoded, K_ROUNDABOUT, true);
+            }
+
         } else
         {
             encoded = handleFerryTags(way,

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

@@ -262,7 +262,7 @@ public long handleWayTags( OSMWay way, long allowed, long relationFlags )
 
         long encoded;
         if (!isFerry(allowed))
-        {
+        {           
             String sacScale = way.getTag("sac_scale");
             if (sacScale != null)
             {
@@ -282,6 +282,12 @@ public long handleWayTags( OSMWay way, long allowed, long relationFlags )
 
             encoded = setLong(encoded, PriorityWeighting.KEY, handlePriority(way, priorityFromRelation));
 
+            boolean isRoundabout = way.hasTag("junction", "roundabout");
+            if (isRoundabout)
+            {
+                encoded = setBool(encoded, K_ROUNDABOUT, true);
+            }
+
         } else
         {
             encoded = handleFerryTags(way, SLOW_SPEED, MEAN_SPEED, FERRY_SPEED);

core/src/main/java/com/graphhopper/util/Constants.java

@@ -51,7 +51,7 @@ public class Constants
     public static final String OS_VERSION = System.getProperty("os.version");
     public static final String JAVA_VENDOR = System.getProperty("java.vendor");
     public static final int VERSION_NODE = 4;
-    public static final int VERSION_EDGE = 11;
+    public static final int VERSION_EDGE = 12;
     public static final int VERSION_GEOMETRY = 3;
     public static final int VERSION_LOCATION_IDX = 2;
     public static final int VERSION_NAME_IDX = 2;

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

@@ -141,6 +141,12 @@ public void testHandleWayTags()
         way.setTag("tracktype", "grade2");
         wayType = getWayTypeFromFlags(way);
         assertEquals("get off the bike, unpaved", wayType);
+
+        way.clearTags();
+        way.setTag("junction", "roundabout");
+        way.setTag("highway", "tertiary");
+        long flags = encoder.handleWayTags(way, encoder.acceptWay(way), 0);
+        assertTrue(encoder.isBool(flags, FlagEncoder.K_ROUNDABOUT));
     }
 
     @Test
@@ -199,7 +205,7 @@ public void testOneway()
         assertTrue(encoder.isBackward(flags));
         way.clearTags();
     }
-
+    
     @Test
     public void testHandleWayTagsInfluencedByRelation()
     {

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

@@ -255,4 +255,13 @@ public void testBarrierAccess()
         // barrier!
         assertTrue(footEncoder.handleNodeTags(node) > 0);
     }
+
+    @Test
+    public void handleWayTagsRoundabout() {
+        OSMWay way = new OSMWay(1);
+        way.setTag("junction", "roundabout");
+        way.setTag("highway", "tertiary");
+        long flags = footEncoder.handleWayTags(way, footEncoder.acceptWay(way), 0);
+        assertTrue(footEncoder.isBool(flags, FlagEncoder.K_ROUNDABOUT));
+    }
 }