pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Route time estimation fix

Browse source
This commit is contained in:
Lev Dragunov 2015-04-09 16:55:43 +03:00 • committed by Alex Zolotarev
parent 36814a43b9
commit bddec9daef
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
routing/features_road_graph.cpp
View file

@ -253,6 +253,8 @@ void FeaturesRoadGraph::ReconstructPath(RoadPosVectorT const & positions, Route
FeatureType ft1;
vector<m2::PointD> poly;
double trackTime = 0;
// Initialize starting point.
LoadFeature(positions.back().GetFeatureId(), ft1);
@ -278,10 +280,14 @@ void FeaturesRoadGraph::ReconstructPath(RoadPosVectorT const & positions, Route
int const inc = pos1.IsForward() ? -1 : 1;
int ptID = pos1.GetSegStartPointId();
m2::PointD pt;
m2::PointD beforePt = ft1.GetPoint(ptID);
double segmentLength = 0.0;
do
{
pt = ft1.GetPoint(ptID);
poly.push_back(pt);
segmentLength += CalcDistanceMeters(pt, beforePt);
beforePt = pt;
LOG(LDEBUG, (pt, pos1.GetFeatureId(), ptID));
@ -289,6 +295,10 @@ void FeaturesRoadGraph::ReconstructPath(RoadPosVectorT const & positions, Route
} while (ptID >= 0 && ptID < ft1.GetPointsCount() && !m2::AlmostEqual(pt, lastPt));
segmentLength += CalcDistanceMeters(lastPt, beforePt);
// Calculation total feature time. Seconds.
trackTime += 3.6 /* normalization to seconds*/ * segmentLength / m_vehicleModel->GetSpeed(ft1);
// Assign current processing feature.
if (diffIDs)
ft1.SwapGeometry(ft2);
@ -299,8 +309,7 @@ void FeaturesRoadGraph::ReconstructPath(RoadPosVectorT const & positions, Route
Route::TurnsT turnsDir;
Route::TimesT times;
/// @todo Make proper time and turns calculation.
times.emplace_back(poly.size() - 1, 100500);
times.emplace_back(poly.size() - 1, trackTime);
turnsDir.emplace_back(poly.size() - 1, turns::ReachedYourDestination);
route.SetGeometry(poly.rbegin(), poly.rend());