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-07-09 15:01:44 +03:00 • committed by Alex Zolotarev
parent 24c7f556e1
commit 3c2b18cf20
10 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
indexer/indexer_tests/test_mwm_set.hpp
View file

@ -10,10 +10,8 @@
using platform::CountryFile;
using platform::LocalCountryFile;
namespace tests
{
class MwmValue : public MwmSet::MwmValueBase
{
};

2
indexer/mwm_set.hpp
View file

@ -64,7 +64,7 @@ public:
MwmTypeT GetType() const;
/// Returns the lock counter value for test needs.
uint8_t GetLockCount() {return m_numRefs;}
uint8_t GetLockCount() { return m_numRefs; }
private:
inline void SetStatus(Status status) { m_status = status; }

3
map/framework.cpp
View file

@ -2177,8 +2177,7 @@ void Framework::SetRouter(RouterType type)
}
else
{
router.reset(new OsrmRouter(&m_model.GetIndex(), countryFileGetter,
routingVisualizerFn));
router.reset(new OsrmRouter(&m_model.GetIndex(), countryFileGetter, routingVisualizerFn));
fetcher.reset(new OnlineAbsentCountriesFetcher(countryFileGetter, localFileGetter));
}

6
pedestrian_routing_benchmarks/pedestrian_routing_benchmarks.cpp
View file

@ -58,7 +58,8 @@ private:
shared_ptr<routing::IVehicleModel> const m_model;
};
unique_ptr<routing::IRouter> CreatePedestrianAStarTestRouter(Index & index, routing::TMwmFileByPointFn const & countryFileFn)
unique_ptr<routing::IRouter> CreatePedestrianAStarTestRouter(
Index & index, routing::TMwmFileByPointFn const & countryFileFn)
{
unique_ptr<routing::IVehicleModelFactory> vehicleModelFactory(new SimplifiedPedestrianModelFactory());
@ -67,7 +68,8 @@ unique_ptr<routing::IRouter> CreatePedestrianAStarTestRouter(Index & index, rout
return router;
}
unique_ptr<routing::IRouter> CreatePedestrianAStarBidirectionalTestRouter(Index & index, routing::TMwmFileByPointFn const & countryFileFn)
unique_ptr<routing::IRouter> CreatePedestrianAStarBidirectionalTestRouter(
Index & index, routing::TMwmFileByPointFn const & countryFileFn)
{
unique_ptr<routing::IVehicleModelFactory> vehicleModelFactory(new SimplifiedPedestrianModelFactory());
unique_ptr<routing::IRoutingAlgorithm> algorithm(new routing::AStarBidirectionalRoutingAlgorithm(nullptr));

10
routing/cross_mwm_road_graph.cpp
View file

@ -136,11 +136,11 @@ BorderCross CrossMwmGraph::FindNextMwmNode(OutgoingCrossNode const & startNode,
if (ms::DistanceOnEarth(startPoint.y, startPoint.x, targetPoint.y, targetPoint.x) <
kMwmCrossingNodeEqualityRadiusMeters)
{
BorderCross const cross(CrossNode(startNode.m_nodeId,
currentMapping->GetCountryFile().GetNameWithoutExt(),
MercatorBounds::FromLatLon(targetPoint.y, targetPoint.x)),
CrossNode(i->m_nodeId, nextMwm,
MercatorBounds::FromLatLon(targetPoint.y, targetPoint.x)));
BorderCross const cross(
CrossNode(startNode.m_nodeId, currentMapping->GetCountryFile().GetNameWithoutExt(),
MercatorBounds::FromLatLon(targetPoint.y, targetPoint.x)),
CrossNode(i->m_nodeId, nextMwm,
MercatorBounds::FromLatLon(targetPoint.y, targetPoint.x)));
m_cachedNextNodes.insert(make_pair(startPoint, cross));
return cross;
}

3
routing/osrm_router.cpp
View file

@ -537,7 +537,8 @@ OsrmRouter::ResultCode OsrmRouter::CalculateRoute(m2::PointD const & startPoint,
startMapping->LoadCrossContext();
auto out_iterators = startMapping->m_crossContext.GetOutgoingIterators();
for (auto i = out_iterators.first; i != out_iterators.second; ++i)
if (startMapping->m_crossContext.GetOutgoingMwmName(*i) == targetMapping->GetCountryFile().GetNameWithoutExt())
if (startMapping->m_crossContext.GetOutgoingMwmName(*i) ==
targetMapping->GetCountryFile().GetNameWithoutExt())
{
route.AddAbsentCountry(targetMapping->GetCountryFile().GetNameWithoutExt());
return targetMapping->GetError();

19
routing/road_graph_router.cpp
View file

@ -55,16 +55,15 @@ string GetCountryForMwmFile(string const & mwmName)
RoadGraphRouter::~RoadGraphRouter() {}
RoadGraphRouter::RoadGraphRouter(string const & name,
Index & index,
RoadGraphRouter::RoadGraphRouter(string const & name, Index & index,
unique_ptr<IVehicleModelFactory> && vehicleModelFactory,
unique_ptr<IRoutingAlgorithm> && algorithm,
TMwmFileByPointFn const & countryFileFn)
: m_name(name)
, m_index(index)
, m_vehicleModelFactory(move(vehicleModelFactory))
, m_algorithm(move(algorithm))
, m_countryFileFn(countryFileFn)
: m_name(name),
m_index(index),
m_vehicleModelFactory(move(vehicleModelFactory)),
m_algorithm(move(algorithm)),
m_countryFileFn(countryFileFn)
{
}
@ -159,9 +158,9 @@ unique_ptr<IRouter> CreatePedestrianAStarRouter(Index & index,
return router;
}
unique_ptr<IRouter> CreatePedestrianAStarBidirectionalRouter(Index & index,
TMwmFileByPointFn const & countryFileFn,
TRoutingVisualizerFn const & visualizerFn)
unique_ptr<IRouter> CreatePedestrianAStarBidirectionalRouter(
Index & index, TMwmFileByPointFn const & countryFileFn,
TRoutingVisualizerFn const & visualizerFn)
{
unique_ptr<IVehicleModelFactory> vehicleModelFactory(new PedestrianModelFactory());
unique_ptr<IRoutingAlgorithm> algorithm(new AStarBidirectionalRoutingAlgorithm(visualizerFn));

11
routing/road_graph_router.hpp
View file

@ -24,8 +24,7 @@ typedef function<string(m2::PointD const &)> TMwmFileByPointFn;
class RoadGraphRouter : public IRouter
{
public:
RoadGraphRouter(string const & name,
Index & index,
RoadGraphRouter(string const & name, Index & index,
unique_ptr<IVehicleModelFactory> && vehicleModelFactory,
unique_ptr<IRoutingAlgorithm> && algorithm,
TMwmFileByPointFn const & countryFileFn);
@ -57,12 +56,12 @@ private:
unique_ptr<IRoadGraph> m_roadGraph;
shared_ptr<IVehicleModel> m_vehicleModel;
};
unique_ptr<IRouter> CreatePedestrianAStarRouter(Index & index,
TMwmFileByPointFn const & countryFileFn,
TRoutingVisualizerFn const & visualizerFn);
unique_ptr<IRouter> CreatePedestrianAStarBidirectionalRouter(Index & index,
TMwmFileByPointFn const & countryFileFn,
TRoutingVisualizerFn const & visualizerFn);
unique_ptr<IRouter> CreatePedestrianAStarBidirectionalRouter(
Index & index, TMwmFileByPointFn const & countryFileFn,
TRoutingVisualizerFn const & visualizerFn);
} // namespace routing

4
routing/routing_mapping.cpp
View file

@ -136,8 +136,8 @@ TRoutingMappingPtr RoutingIndexManager::GetMappingByName(string const & mapName)
return mapIter->second;
// Or load and check file.
TRoutingMappingPtr newMapping = make_shared<RoutingMapping>(platform::CountryFile(mapName),
m_index);
TRoutingMappingPtr newMapping =
make_shared<RoutingMapping>(platform::CountryFile(mapName), m_index);
m_mapping.insert(make_pair(mapName, newMapping));
return newMapping;
}

5
routing/routing_mapping.h
View file

@ -46,7 +46,7 @@ struct RoutingMapping
void FreeCrossContext();
bool IsValid() const {return m_handle.IsAlive() && m_error == IRouter::ResultCode::NoError;}
bool IsValid() const { return m_handle.IsAlive() && m_error == IRouter::ResultCode::NoError; }
IRouter::ResultCode GetError() const {return m_error;}
@ -105,8 +105,7 @@ public:
class RoutingIndexManager
{
public:
RoutingIndexManager(TCountryFileFn const & countryFileFn,
MwmSet * index)
RoutingIndexManager(TCountryFileFn const & countryFileFn, MwmSet * index)
: m_countryFileFn(countryFileFn), m_index(index)
{
ASSERT(index, ());