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

(more) accurate travel time on segments

Browse Source
This commit is contained in:
Dennis Luxen 2011-04-18 16:47:10 +00:00
parent 4e01f75be7
commit 68c210d184
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DataStructures/SearchEngine.h
View File

@ -298,6 +298,16 @@ public:
return ed.middleName.nameID; return ed.middleName.nameID;
} }
inline NodeID GetWeightForOriginDestinationNodeID(NodeID s, NodeID t) const {
assert(s!=t);
EdgeID e = _graph->FindEdge( s, t );
if(e == UINT_MAX)
e = _graph->FindEdge( t, s );
assert(e != UINT_MAX);
const EdgeData ed = _graph->GetEdgeData(e);
return ed.distance;
}
inline std::string& GetNameForNameID(const NodeID nameID) const { inline std::string& GetNameForNameID(const NodeID nameID) const {
assert(nameID < _names->size()); assert(nameID < _names->size());
return _names->at(nameID); return _names->at(nameID);

20
Plugins/JSONDescriptor.h
View File

@ -37,7 +37,7 @@ public:
string shortDirection = "E"; string shortDirection = "E";
int lastPosition = 0; int lastPosition = 0;
int position = 0; int position = 0;
int travelTimeOnSegment = 0; unsigned durationOfInstruction = 0;
double lastAngle = 0.; double lastAngle = 0.;
reply.content += ("{\n"); reply.content += ("{\n");
@ -131,10 +131,12 @@ public:
next = _Coordinate(phantomNodes->targetCoord.lat, phantomNodes->targetCoord.lon); next = _Coordinate(phantomNodes->targetCoord.lat, phantomNodes->targetCoord.lon);
nextID = sEngine->GetNameIDForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2); nextID = sEngine->GetNameIDForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2);
nextType = sEngine->GetTypeOfEdgeForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2); nextType = sEngine->GetTypeOfEdgeForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2);
durationOfInstruction += sEngine->GetWeightForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2);
} else { } else {
sEngine->getNodeInfo((it+1)->node, next); sEngine->getNodeInfo((it+1)->node, next);
nextID = sEngine->GetNameIDForOriginDestinationNodeID(it->node, (it+1)->node); nextID = sEngine->GetNameIDForOriginDestinationNodeID(it->node, (it+1)->node);
nextType = sEngine->GetTypeOfEdgeForOriginDestinationNodeID(it->node, (it+1)->node); nextType = sEngine->GetTypeOfEdgeForOriginDestinationNodeID(it->node, (it+1)->node);
durationOfInstruction += sEngine->GetWeightForOriginDestinationNodeID(it->node, (it+1)->node);
} }
if(nextID == nameID) { if(nextID == nameID) {
@ -148,7 +150,7 @@ public:
if(nameID != 0) if(nameID != 0)
routeInstructionString += sEngine->GetNameForNameID(nameID); routeInstructionString += sEngine->GetNameForNameID(nameID);
routeInstructionString += "\","; routeInstructionString += "\",";
distanceOfInstruction = ApproximateDistance(previous.lat, previous.lon, current.lat, current.lon)+tempDist; distanceOfInstruction += ApproximateDistance(previous.lat, previous.lon, current.lat, current.lon)+tempDist;
entireDistance += distanceOfInstruction; entireDistance += distanceOfInstruction;
intNumberString.str(""); intNumberString.str("");
intNumberString << 10*(round(distanceOfInstruction/10.));; intNumberString << 10*(round(distanceOfInstruction/10.));;
@ -160,11 +162,11 @@ public:
routeInstructionString += intNumberString.str(); routeInstructionString += intNumberString.str();
routeInstructionString += ","; routeInstructionString += ",";
intNumberString.str(""); intNumberString.str("");
intNumberString << travelTimeOnSegment; intNumberString << durationOfInstruction/10;
routeInstructionString += intNumberString.str(); routeInstructionString += intNumberString.str();
routeInstructionString += ",\""; routeInstructionString += ",\"";
intNumberString.str(""); intNumberString.str("");
intNumberString << 10*(round(distanceOfInstruction/10.));; intNumberString << 10*(round(distanceOfInstruction/10.));
routeInstructionString += intNumberString.str(); routeInstructionString += intNumberString.str();
routeInstructionString += "m\",\""; routeInstructionString += "m\",\"";
routeInstructionString += shortDirection; routeInstructionString += shortDirection;
@ -199,6 +201,7 @@ public:
lastAngle = angle; lastAngle = angle;
tempDist = 0; tempDist = 0;
prevType = type; prevType = type;
durationOfInstruction = 0;
} }
nameID = nextID; nameID = nextID;
previous = current; previous = current;
@ -206,6 +209,7 @@ public:
} }
nameID = sEngine->GetNameIDForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2); nameID = sEngine->GetNameIDForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2);
type = sEngine->GetTypeOfEdgeForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2); type = sEngine->GetTypeOfEdgeForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2);
durationOfInstruction += sEngine->GetWeightForOriginDestinationNodeID(phantomNodes->targetNode1, phantomNodes->targetNode2);
routeInstructionString += " at "; routeInstructionString += " at ";
routeInstructionString += sEngine->GetNameForNameID(nameID); routeInstructionString += sEngine->GetNameForNameID(nameID);
routeInstructionString += "\","; routeInstructionString += "\",";
@ -219,9 +223,9 @@ public:
numberString << lastPosition; numberString << lastPosition;
routeInstructionString += numberString.str(); routeInstructionString += numberString.str();
routeInstructionString += ","; routeInstructionString += ",";
numberString.str(""); intNumberString.str("");
numberString << travelTimeOnSegment; intNumberString << durationOfInstruction/10;
routeInstructionString += numberString.str(); routeInstructionString += intNumberString.str();
routeInstructionString += ",\""; routeInstructionString += ",\"";
intNumberString.str(""); intNumberString.str("");
intNumberString << 10*(round(distanceOfInstruction/10.));; intNumberString << 10*(round(distanceOfInstruction/10.));;
@ -253,7 +257,7 @@ public:
routeSummaryString += s.str(); routeSummaryString += s.str();
routeSummaryString += ",\n \"total_time\":"; routeSummaryString += ",\n \"total_time\":";
//give travel time in minutes //give travel time in minutes
int travelTime = (distance/60) + 1; int travelTime = distance;
s.str(""); s.str("");
s << travelTime; s << travelTime;
routeSummaryString += s.str(); routeSummaryString += s.str();