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

lua setting for using turn restrictions

Browse Source
This commit is contained in:
Emil Tin 2013-02-05 17:26:35 +01:00 committed by DennisOSRM
parent cad0069be2
commit d59e526e1e
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Extractor/PBFParser.cpp
View File

@ -20,7 +20,7 @@
#include "PBFParser.h" #include "PBFParser.h"
PBFParser::PBFParser(const char * fileName) : externalMemory(NULL){ PBFParser::PBFParser(const char * fileName) : externalMemory(NULL), use_turn_restrictions(true) {
GOOGLE_PROTOBUF_VERIFY_VERSION; GOOGLE_PROTOBUF_VERIFY_VERSION;
//TODO: What is the bottleneck here? Filling the queue or reading the stuff from disk? //TODO: What is the bottleneck here? Filling the queue or reading the stuff from disk?
//NOTE: With Lua scripting, it is parsing the stuff. I/O is virtually for free. //NOTE: With Lua scripting, it is parsing the stuff. I/O is virtually for free.
@ -43,7 +43,13 @@ void PBFParser::RegisterCallbacks(ExtractorCallbacks * em) {
void PBFParser::RegisterScriptingEnvironment(ScriptingEnvironment & _se) { void PBFParser::RegisterScriptingEnvironment(ScriptingEnvironment & _se) {
scriptingEnvironment = _se; scriptingEnvironment = _se;
if(0 != luaL_dostring( scriptingEnvironment.getLuaStateForThreadID(0), "return use_turn_restrictions\n")) {
ERR(lua_tostring(scriptingEnvironment.getLuaStateForThreadID(0),-1)<< " occured in scripting block");
}
use_turn_restrictions = lua_toboolean(scriptingEnvironment.getLuaStateForThreadID(0), -1);
INFO("Use turn restrictions:" << use_turn_restrictions);
if(lua_function_exists(scriptingEnvironment.getLuaStateForThreadID(0), "get_exceptions" )) { if(lua_function_exists(scriptingEnvironment.getLuaStateForThreadID(0), "get_exceptions" )) {
//get list of turn restriction exceptions //get list of turn restriction exceptions
try { try {
@ -241,6 +247,9 @@ inline void PBFParser::parseNode(_ThreadData * ) {
inline void PBFParser::parseRelation(_ThreadData * threadData) { inline void PBFParser::parseRelation(_ThreadData * threadData) {
//TODO: leave early, if relation is not a restriction //TODO: leave early, if relation is not a restriction
//TODO: reuse rawRestriction container //TODO: reuse rawRestriction container
if( use_turn_restrictions==false )
return;
const OSMPBF::PrimitiveGroup& group = threadData->PBFprimitiveBlock.primitivegroup( threadData->currentGroupID ); const OSMPBF::PrimitiveGroup& group = threadData->PBFprimitiveBlock.primitivegroup( threadData->currentGroupID );
for(int i = 0; i < group.relations_size(); ++i ) { for(int i = 0; i < group.relations_size(); ++i ) {
std::string exception_of_restriction_tag; std::string exception_of_restriction_tag;

3
Extractor/PBFParser.h
View File

@ -106,7 +106,8 @@ private:
/* ThreadData Queue */ /* ThreadData Queue */
boost::shared_ptr<ConcurrentQueue < _ThreadData* > > threadDataQueue; boost::shared_ptr<ConcurrentQueue < _ThreadData* > > threadDataQueue;
ScriptingEnvironment scriptingEnvironment; ScriptingEnvironment scriptingEnvironment;
bool use_turn_restrictions;
std::vector<std::string> restriction_exceptions_vector; std::vector<std::string> restriction_exceptions_vector;
}; };

2
profiles/bicycle.lua
View File

@ -64,6 +64,7 @@ man_made_speeds = {
route_speeds = { route_speeds = {
["ferry"] = 5 ["ferry"] = 5
} }
take_minimum_of_speeds = true take_minimum_of_speeds = true
obey_oneway = true obey_oneway = true
obey_bollards = false obey_bollards = false
@ -71,6 +72,7 @@ use_restrictions = true
ignore_areas = true -- future feature ignore_areas = true -- future feature
traffic_signal_penalty = 2 traffic_signal_penalty = 2
u_turn_penalty = 20 u_turn_penalty = 20
use_turn_restrictions = true
-- End of globals -- End of globals

1
profiles/car.lua
View File

@ -39,6 +39,7 @@ use_restrictions = true
ignore_areas = true -- future feature ignore_areas = true -- future feature
traffic_signal_penalty = 2 traffic_signal_penalty = 2
u_turn_penalty = 20 u_turn_penalty = 20
use_turn_restrictions = true
-- End of globals -- End of globals