Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

commit another if statement

Browse Source
This commit is contained in:
Dennis Luxen 2014-11-20 14:59:27 +01:00
parent 9807520ef0
commit 75157221b2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Extractor/RestrictionParser.cpp
View File

@ -63,7 +63,8 @@ RestrictionParser::RestrictionParser(lua_State *lua_state)
void RestrictionParser::ReadUseRestrictionsSetting(lua_State *lua_state) void RestrictionParser::ReadUseRestrictionsSetting(lua_State *lua_state)
{ {
if (0 == luaL_dostring(lua_state, "return use_turn_restrictions\n") && lua_isboolean(lua_state, -1)) if (0 == luaL_dostring(lua_state, "return use_turn_restrictions\n") &&
lua_isboolean(lua_state, -1))
{ {
use_turn_restrictions = lua_toboolean(lua_state, -1); use_turn_restrictions = lua_toboolean(lua_state, -1);
} }
@ -125,13 +126,10 @@ RestrictionParser::TryParse(osmium::Relation &relation) const
// check if the restriction should be ignored // check if the restriction should be ignored
const char *except = relation.get_value_by_key("except"); const char *except = relation.get_value_by_key("except");
if (except != nullptr) if (except != nullptr && ShouldIgnoreRestriction(except))
{
if (ShouldIgnoreRestriction(except))
{ {
return mapbox::util::optional<InputRestrictionContainer>(); return mapbox::util::optional<InputRestrictionContainer>();
} }
}
bool is_only_restriction = false; bool is_only_restriction = false;