cache flags in EdgeIterable

Author: Peter

core/src/main/java/com/graphhopper/storage/BaseGraph.java

@@ -487,6 +487,8 @@ protected static class EdgeIterable implements EdgeExplorer, EdgeIterator
         boolean reverse;
         final BaseGraph baseGraph;
         EdgeAccess edgeAccess;
+        private boolean freshFlags;
+        private long cachedFlags;
 
         public EdgeIterable( BaseGraph baseGraph, EdgeAccess edgeAccess, EdgeFilter filter )
         {
@@ -522,7 +524,7 @@ final boolean init( int tmpEdgeId, int expectedAdjNode )
             nextEdgeId = EdgeIterator.NO_EDGE;
             if (expectedAdjNode == adjNode || expectedAdjNode == Integer.MIN_VALUE)
             {
-                reverse = false;                
+                reverse = false;
                 return true;
             } else if (expectedAdjNode == baseNode)
             {
@@ -579,6 +581,7 @@ public final boolean next()
                 edgeId = nextEdgeId;
                 adjNode = edgeAccess.getOtherNode(baseNode, edgePointer);
                 reverse = baseNode > adjNode;
+                freshFlags = false;
 
                 // position to next edge                
                 nextEdgeId = edgeAccess.edges.getInt(edgeAccess.getLinkPosInEdgeArea(baseNode, adjNode, edgePointer));
@@ -613,12 +616,19 @@ public final EdgeIteratorState setDistance( double dist )
         @Override
         public final long getFlags()
         {
-            return edgeAccess.getFlags_(edgePointer, reverse);
+            if (!freshFlags)
+            {
+                cachedFlags = edgeAccess.getFlags_(edgePointer, reverse);
+                freshFlags = true;
+            }
+            return cachedFlags;
         }
 
         @Override
         public final EdgeIteratorState setFlags( long fl )
-        {
+        {            
+            cachedFlags = fl;
+            freshFlags = true;
             edgeAccess.setFlags_(edgePointer, reverse, fl);
             return this;
         }

core/src/main/java/com/graphhopper/storage/EdgeAccess.java

@@ -121,7 +121,7 @@ final long getFlags_( long edgePointer, boolean reverse )
         return resFlags;
     }
 
-    final void setFlags_( long edgePointer, boolean reverse, long flags )
+    final long setFlags_( long edgePointer, boolean reverse, long flags )
     {
         if (reverse)
             flags = reverseFlags(edgePointer, flags);
@@ -130,6 +130,8 @@ final void setFlags_( long edgePointer, boolean reverse, long flags )
 
         if (flagsSizeIsLong)
             edges.setInt(edgePointer + E_FLAGS + 4, bitUtil.getIntHigh(flags));
+
+        return flags;
     }
 
     /**