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

clang-format

Browse source
This commit is contained in:
Lev Dragunov 2015-06-24 11:53:22 +03:00 • committed by Alex Zolotarev
parent 78dd5ac092
commit a4ab42f218
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration_tests/osrm_route_test.cpp
View file

@ -86,11 +86,11 @@ namespace
UNIT_TEST(MoroccoToSahrawiCrossMwmTest)
{
integration::CalculateRouteAndTestRouteLength(
integration::GetAllMaps(), MercatorBounds::FromLatLon(27.15587, -13.23059), {0., 0.},
MercatorBounds::FromLatLon(27.94049, -12.88800), 100864);
integration::GetAllMaps(), MercatorBounds::FromLatLon(27.15587, -13.23059), {0., 0.},
MercatorBounds::FromLatLon(27.94049, -12.88800), 100864);
integration::CalculateRouteAndTestRouteLength(
integration::GetAllMaps(), MercatorBounds::FromLatLon(27.94049, -12.88800), {0., 0.},
MercatorBounds::FromLatLon(27.15587, -13.23059), 100864);
integration::GetAllMaps(), MercatorBounds::FromLatLon(27.94049, -12.88800), {0., 0.},
MercatorBounds::FromLatLon(27.15587, -13.23059), 100864);
}
UNIT_TEST(ArbatBaliCrimeanForwardCrossMwmTest)

5
routing/cross_mwm_road_graph.cpp
View file

@ -198,14 +198,13 @@ double CrossMwmGraph::HeuristicCostEstimate(BorderCross const & v, BorderCross c
void ConvertToSingleRouterTasks(vector<BorderCross> const & graphCrosses,
FeatureGraphNode const & startGraphNode,
FeatureGraphNode const & finalGraphNode,
TCheckedPath & route)
FeatureGraphNode const & finalGraphNode, TCheckedPath & route)
{
route.clear();
for (size_t i = 0; i + 1 < graphCrosses.size(); ++i)
{
route.emplace_back(graphCrosses[i].toNode.node, graphCrosses[i + 1].fromNode.node,
graphCrosses[i].toNode.mwmName);
graphCrosses[i].toNode.mwmName);
}
if (route.empty())

9
routing/cross_mwm_road_graph.hpp
View file

@ -40,7 +40,7 @@ struct CrossNode
{
if (a.node != node)
return node < a.node;
if(isVirtual != a.isVirtual)
if (isVirtual != a.isVirtual)
return isVirtual < a.isVirtual;
return mwmName < a.mwmName;
}
@ -122,9 +122,8 @@ private:
//--------------------------------------------------------------------------------------------------
/// Convertor from CrossMwmGraph to cross mwm route task.
void ConvertToSingleRouterTasks(vector<BorderCross> const & graphCrosses,
FeatureGraphNode const & startGraphNode,
FeatureGraphNode const & finalGraphNode,
TCheckedPath & route);
void ConvertToSingleRouterTasks(vector<BorderCross> const & graphCrosses,
FeatureGraphNode const & startGraphNode,
FeatureGraphNode const & finalGraphNode, TCheckedPath & route);
} // namespace routing