From 6d74ae1b84a04e1c6778f88e3b858ed7e07a5015 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Tue, 13 Mar 2012 16:03:43 +0100 Subject: [PATCH] Allowing toll_booth's to be bypassed. --- DataStructures/PBFParser.h | 2 +- DataStructures/XMLParser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DataStructures/PBFParser.h b/DataStructures/PBFParser.h index 1eb459248..e9a0fe2c3 100644 --- a/DataStructures/PBFParser.h +++ b/DataStructures/PBFParser.h @@ -224,7 +224,7 @@ private: denseTagIndex += 2; } std::string barrierValue = keyVals.Find("barrier"); - if(0 < barrierValue.length() && "border_control" != barrierValue) + if(0 < barrierValue.length() && "border_control" != barrierValue && "toll_booth" != barrierValue) n.bollard = true; if("traffic_signals" == keyVals.Find("highway")) diff --git a/DataStructures/XMLParser.h b/DataStructures/XMLParser.h index 95152dcd8..e1ad92ba9 100644 --- a/DataStructures/XMLParser.h +++ b/DataStructures/XMLParser.h @@ -256,7 +256,7 @@ private: } } if ( xmlStrEqual( k, ( const xmlChar* ) "barrier" ) == 1 ) { - if ( xmlStrEqual( value, ( const xmlChar* ) "" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "border_control" ) != 1){ + if ( xmlStrEqual( value, ( const xmlChar* ) "" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "border_control" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "toll_booth" ) != 1){ node.bollard = true; } }