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

Parsing duration when present

Browse Source
This commit is contained in:
DennisOSRM 2013-01-27 23:06:23 +01:00
parent 59481dd762
commit 03de87c213
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Extractor/ExtractorCallbacks.cpp
View File

@ -67,8 +67,7 @@ bool ExtractorCallbacks::restrictionFunction(_RawRestrictionContainer &r) {
bool ExtractorCallbacks::wayFunction(_Way &w) { bool ExtractorCallbacks::wayFunction(_Way &w) {
/*** Store name of way and split it into edge segments ***/ /*** Store name of way and split it into edge segments ***/
if ( w.speed > 0 ) { //Only true if the way is specified by the speed profile if ( 0 < w.speed > 0 || 0 < w.duration ) { //Only true if the way is specified by the speed profile
//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);
if(strit == stringMap->end()) { if(strit == stringMap->end()) {
@ -79,6 +78,11 @@ bool ExtractorCallbacks::wayFunction(_Way &w) {
w.nameID = strit->second; w.nameID = strit->second;
} }
if(w.duration > 0) {
//TODO: iterate all way segments and set duration corresponding to the length of each segment
w.speed = w.duration/(w.path.size()-1);
}
if(fabs(-1. - w.speed) < FLT_EPSILON){ if(fabs(-1. - w.speed) < FLT_EPSILON){
WARN("found way with bogus speed, id: " << w.id); WARN("found way with bogus speed, id: " << w.id);
return true; return true;
@ -93,7 +97,7 @@ bool ExtractorCallbacks::wayFunction(_Way &w) {
} }
for(std::vector< NodeID >::size_type n = 0; n < w.path.size()-1; ++n) { for(std::vector< NodeID >::size_type n = 0; n < w.path.size()-1; ++n) {
externalMemory->allEdges.push_back(_Edge(w.path[n], w.path[n+1], w.type, w.direction, w.speed, w.nameID, w.roundabout, w.ignoreInGrid, w.isDurationSet, w.isAccessRestricted)); externalMemory->allEdges.push_back(_Edge(w.path[n], w.path[n+1], w.type, w.direction, w.speed, w.nameID, w.roundabout, w.ignoreInGrid, (w.duration > 0), w.isAccessRestricted));
externalMemory->usedNodeIDs.push_back(w.path[n]); externalMemory->usedNodeIDs.push_back(w.path[n]);
} }
externalMemory->usedNodeIDs.push_back(w.path.back()); externalMemory->usedNodeIDs.push_back(w.path.back());