From b783b4568a099553114bb3dd3edfbeb829ea9e24 Mon Sep 17 00:00:00 2001 From: Arndt Brenschede Date: Wed, 7 Mar 2018 19:35:23 +0100 Subject: [PATCH] motorcar TR exceptions --- brouter-core/src/main/java/btools/router/OsmPath.java | 2 +- .../src/main/java/btools/mapaccess/TurnRestriction.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/brouter-core/src/main/java/btools/router/OsmPath.java b/brouter-core/src/main/java/btools/router/OsmPath.java index 1454662..eff857e 100644 --- a/brouter-core/src/main/java/btools/router/OsmPath.java +++ b/brouter-core/src/main/java/btools/router/OsmPath.java @@ -192,7 +192,7 @@ abstract class OsmPath implements OsmLinkHolder TurnRestriction tr = sourceNode.firstRestriction; while( tr != null ) { - if ( tr.exceptBikes() && rc.bikeMode ) + if ( ( tr.exceptBikes() && rc.bikeMode ) || tr.exceptMotorcars() && rc.carMode ) { tr = tr.next; continue; diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/TurnRestriction.java b/brouter-mapaccess/src/main/java/btools/mapaccess/TurnRestriction.java index 0764f70..03b0a0f 100644 --- a/brouter-mapaccess/src/main/java/btools/mapaccess/TurnRestriction.java +++ b/brouter-mapaccess/src/main/java/btools/mapaccess/TurnRestriction.java @@ -23,6 +23,11 @@ public final class TurnRestriction return ( exceptions & 1 ) != 0; } + public boolean exceptMotorcars() + { + return ( exceptions & 2 ) != 0; + } + @Override public String toString() {