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

[pedestrian,routing] use proper distance function

Browse source
This commit is contained in:
Maxim Pimenov 2015-04-07 17:17:46 +03:00 • committed by Alex Zolotarev
parent 7871b033ea
commit e631e75971
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routing/astar_router.cpp
View file

@ -87,20 +87,14 @@ double AStarRouter::HeuristicCostEstimate(AStarRouter::ShortestPath const * s1,
m2::PointD const & b = (*goals.begin()).GetSegEndpoint();
m2::PointD const & e = s1->GetPos().GetSegEndpoint();
return ms::DistanceOnEarth(MercatorBounds::YToLat(b.y),
MercatorBounds::XToLon(b.x),
MercatorBounds::YToLat(e.y),
MercatorBounds::XToLon(e.x)) / MAX_SPEED;
return MercatorBounds::DistanceOnEarth(b, e) / MAX_SPEED;
}
double AStarRouter::DistanceBetween(ShortestPath const * p1, ShortestPath const * p2)
{
m2::PointD const & b = p1->GetPos().GetSegEndpoint();
m2::PointD const & e = p2->GetPos().GetSegEndpoint();
return ms::DistanceOnEarth(MercatorBounds::YToLat(b.y),
MercatorBounds::XToLon(b.x),
MercatorBounds::YToLat(e.y),
MercatorBounds::XToLon(e.x));
return MercatorBounds::DistanceOnEarth(b, e);
}
void AStarRouter::ReconstructRoute(ShortestPath const * path, vector<RoadPos> & route) const