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

Fixes ticket 41. Speed is minimum of tagged maxspeed and definition from

Browse Source 
speedprofile.ini
This commit is contained in:
DennisOSRM 2011-12-06 10:56:42 +01:00
parent 0cad039615
commit 18abdd0cd6
2 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DataStructures/ExtractorCallBacks.h
View File

@ -101,7 +101,7 @@ public:
std::string oneway( w.keyVals.Find("oneway")); std::string oneway( w.keyVals.Find("oneway"));
std::string junction( w.keyVals.Find("junction") ); std::string junction( w.keyVals.Find("junction") );
std::string route( w.keyVals.Find("route") ); std::string route( w.keyVals.Find("route") );
double maxspeed( atoi(w.keyVals.Find("maxspeed").c_str()) ); int maxspeed( atoi(w.keyVals.Find("maxspeed").c_str()) );
std::string access( w.keyVals.Find("access") ); std::string access( w.keyVals.Find("access") );
std::string accessTag( w.keyVals.Find(settings.accessTag) ); std::string accessTag( w.keyVals.Find(settings.accessTag) );
std::string man_made( w.keyVals.Find("man_made") ); std::string man_made( w.keyVals.Find("man_made") );
@ -119,12 +119,17 @@ public:
} }
//Is the highway tag listed as usable way? //Is the highway tag listed as usable way?
if(0 < settings[highway]) { if(0 < settings[highway] || "yes" == accessTag || "designated" == accessTag) {
if(0 < settings[highway]) {
if(0 < maxspeed) if(0 < maxspeed)
w.speed = maxspeed; w.speed = std::min(maxspeed, settings[highway]);
else else
w.speed = settings[highway]; w.speed = settings[highway];
} else {
w.speed = settings.defaultSpeed;
highway = "default";
}
w.useful = true; w.useful = true;
//Okay, do we have access to that way? //Okay, do we have access to that way?
@ -135,9 +140,6 @@ public:
} }
} }
if("yes" == accessTag || "designated" == accessTag) {
w.access = true;
}
if("no" == accessTag) { if("no" == accessTag) {
return true; return true;
} }
@ -158,11 +160,16 @@ public:
w.useful = true; w.useful = true;
w.speed = settings[route]; w.speed = settings[route];
w.direction = _Way::bidirectional; w.direction = _Way::bidirectional;
if(0 < settings[route])
highway = route;
else if (0 < settings[man_made]) {
highway = man_made;
}
} }
} }
if ( w.useful && w.access && (1 < w.path.size()) ) { //Only true if the way is specified by the speed profile if ( w.useful && w.access && (1 < w.path.size()) ) { //Only true if the way is specified by the speed profile
//TODO: type is not set, perhaps use a bimap'ed speed profile to do set the type correctly? //TODO: type is not set, perhaps use a bimap'ed speed profile to do set the type correctly?
w.type = 1; w.type = settings.GetHighwayTypeID(highway);
//Get the unique identifier for the street name //Get the unique identifier for the street name
const StringMap::const_iterator strit = stringMap->find(w.name); const StringMap::const_iterator strit = stringMap->find(w.name);

22
DataStructures/ExtractorStructs.h
View File

@ -36,6 +36,7 @@ struct _PathData {
}; };
typedef boost::unordered_map<std::string, NodeID > StringMap; typedef boost::unordered_map<std::string, NodeID > StringMap;
typedef boost::unordered_map<std::string, std::pair<int, int> > StringToIntPairMap;
struct _Node : NodeInfo{ struct _Node : NodeInfo{
_Node(int _lat, int _lon, unsigned int _id) : NodeInfo(_lat, _lon, _id) {} _Node(int _lat, int _lon, unsigned int _id) : NodeInfo(_lat, _lon, _id) {}
@ -254,19 +255,28 @@ struct CmpWayByID : public std::binary_function<_WayIDStartAndEndEdge, _WayIDSta
}; };
struct Settings { struct Settings {
Settings() : obeyPollards(true), obeyOneways(true), useRestrictions(true), accessTag("motorcar") {} Settings() : obeyPollards(true), obeyOneways(true), useRestrictions(true), accessTag("motorcar"), defaultSpeed(30), excludeFromGrid("ferry") {}
StringMap speedProfile; StringToIntPairMap speedProfile;
int operator[](const string & param) const { int operator[](const std::string & param) const {
if(speedProfile.find(param) == speedProfile.end()) if(speedProfile.find(param) == speedProfile.end())
return 0; return 0;
else else
return speedProfile.at(param); return speedProfile.at(param).first;
}
int GetHighwayTypeID(const std::string & param) const {
if(speedProfile.find(param) == speedProfile.end()) {
DEBUG("There is a bug with highway \"" << param << "\"");
return -1;
} else {
return speedProfile.at(param).second;
}
} }
bool obeyPollards; bool obeyPollards;
bool obeyOneways; bool obeyOneways;
bool useRestrictions; bool useRestrictions;
string accessTag; std::string accessTag;
int defaultSpeed;
std::string excludeFromGrid;
}; };
struct Cmp : public std::binary_function<NodeID, NodeID, bool> { struct Cmp : public std::binary_function<NodeID, NodeID, bool> {