Merge pull request #53 from Robot8A/patch-1

Add isPermittedWayConditionallyRestricted(way, accept)
GIScience · Sep 13, 2022 · 74aba0c · 74aba0c
2 parents 38d9ba6 + 309b241
commit 74aba0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -51,6 +51,7 @@ Here is an overview:
  * PGWelch, shapefile reader #874
  * rajanski, script to do routing via PostGIS
  * ratrun, route relations, GPX information, bike handling etc
+ * Robot8A, AbstractFlagEncoder.isPermittedWayConditionallyRestricted()
  * rodneyodonnell, improved dead end removal (PrepareRoutingSubnetworks) and fords
  * rodo, more descriptions
  * seeebiii, motorcycle improvements

diff --git a/core/src/main/java/com/graphhopper/routing/util/AbstractFlagEncoder.java b/core/src/main/java/com/graphhopper/routing/util/AbstractFlagEncoder.java
@@ -673,8 +673,12 @@ public EncodingManager.Access isRestrictedWayConditionallyPermitted(ReaderWay wa
     }
 
     public EncodingManager.Access isPermittedWayConditionallyRestricted(ReaderWay way) {
-        return getConditionalAccess(way, EncodingManager.Access.WAY, false);
+        return isPermittedWayConditionallyRestricted(way, EncodingManager.Access.WAY);
     }
+
+    public EncodingManager.Access isPermittedWayConditionallyRestricted(ReaderWay way, EncodingManager.Access accept) {
+         return getConditionalAccess(way, accept, false);
+     }
 
     private EncodingManager.Access getConditionalAccess(ReaderWay way, EncodingManager.Access accept, boolean permissive) {
         ConditionalTagInspector conditionalTagInspector = getConditionalTagInspector();