From 97763737840a05bc336f28a500183ee614ebdaf6 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Thu, 1 Mar 2012 09:59:35 +0100 Subject: [PATCH] Allow ways to cross barrier=border_control --- DataStructures/PBFParser.h | 3 ++- DataStructures/XMLParser.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/DataStructures/PBFParser.h b/DataStructures/PBFParser.h index 0690a64ed..1eb459248 100644 --- a/DataStructures/PBFParser.h +++ b/DataStructures/PBFParser.h @@ -223,7 +223,8 @@ private: keyVals.Add(key, value); denseTagIndex += 2; } - if("" != keyVals.Find("barrier")) + std::string barrierValue = keyVals.Find("barrier"); + if(0 < barrierValue.length() && "border_control" != barrierValue) n.bollard = true; if("traffic_signals" == keyVals.Find("highway")) diff --git a/DataStructures/XMLParser.h b/DataStructures/XMLParser.h index 3f4f42488..30c954c81 100644 --- a/DataStructures/XMLParser.h +++ b/DataStructures/XMLParser.h @@ -257,7 +257,7 @@ private: } } if ( xmlStrEqual( k, ( const xmlChar* ) "barrier" ) == 1 ) { - if ( xmlStrEqual( value, ( const xmlChar* ) "" ) != 1 ){ + if ( xmlStrEqual( value, ( const xmlChar* ) "" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "border_control" ) != 1){ node.bollard = true; } }