Merge branch 'patch-1' of https://github.com/AlanBell/osrm-backend into AlanBell-patch-1

This commit is contained in:
Dennis Luxen 2014-11-11 09:47:16 -08:00
commit e3cb26a1c4
2 changed files with 2 additions and 1 deletions

View File

@ -10,6 +10,7 @@ Feature: Car - Barriers
| | x |
| bollard | |
| gate | x |
| lift_gate | x |
| cattle_grid | x |
| border_control | x |
| toll_booth | x |

View File

@ -1,7 +1,7 @@
-- Begin of globals
--require("lib/access") --function temporarily inlined
barrier_whitelist = { ["cattle_grid"] = true, ["border_control"] = true, ["checkpoint"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true, ["no"] = true, ["entrance"] = true }
barrier_whitelist = { ["cattle_grid"] = true, ["border_control"] = true, ["checkpoint"] = true, ["toll_booth"] = true, ["sally_port"] = true, ["gate"] = true, ["lift_gate"] = true, ["no"] = true, ["entrance"] = true }
access_tag_whitelist = { ["yes"] = true, ["motorcar"] = true, ["motor_vehicle"] = true, ["vehicle"] = true, ["permissive"] = true, ["designated"] = true }
access_tag_blacklist = { ["no"] = true, ["private"] = true, ["agricultural"] = true, ["forestry"] = true, ["emergency"] = true }
access_tag_restricted = { ["destination"] = true, ["delivery"] = true }