From 6d8f99832f6f8cc3a99d0b5dc513b38f7e9cd56b Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Mon, 19 Mar 2012 13:48:01 +0100 Subject: [PATCH] Excluding barrier=cattle_grid --- 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 fd3355864..63fcab54c 100644 --- a/DataStructures/PBFParser.h +++ b/DataStructures/PBFParser.h @@ -225,7 +225,7 @@ private: } std::string barrierValue = keyVals.Find("barrier"); std::string access = keyVals.Find("access"); - if(access != "yes" && 0 < barrierValue.length() && "border_control" != barrierValue && "toll_booth" != barrierValue && "no" != barrierValue) + if(access != "yes" && 0 < barrierValue.length() && "cattle_grid" != barrierValue && "border_control" != barrierValue && "toll_booth" != barrierValue && "no" != barrierValue) n.bollard = true; if("traffic_signals" == keyVals.Find("highway")) diff --git a/DataStructures/XMLParser.h b/DataStructures/XMLParser.h index 39455a8ba..71d9b61c2 100644 --- a/DataStructures/XMLParser.h +++ b/DataStructures/XMLParser.h @@ -262,7 +262,7 @@ private: } } if ( xmlStrEqual( k, ( const xmlChar* ) "barrier" ) == 1 ) { - if (!accessYes && xmlStrEqual( value, ( const xmlChar* ) "" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "border_control" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "toll_booth" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "no" ) != 1){ + if (!accessYes && xmlStrEqual( value, ( const xmlChar* ) "" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "border_control" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "cattle_grid" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "toll_booth" ) != 1 && xmlStrEqual( value, ( const xmlChar* ) "no" ) != 1){ node.bollard = true; } }