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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-12-02 08:30:57 +03:00
parent fd74ef61df
commit 3efa51d9a9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
map/traffic_manager.cpp
View file

@ -320,7 +320,7 @@ void TrafficManager::OnTrafficDataResponse(traffic::TrafficInfo && info)
// Update cache.
size_t constexpr kElementSize = sizeof(traffic::TrafficInfo::RoadSegmentId) + sizeof(traffic::SpeedGroup);
// Note. It's necessary to multiply by two because routing and rendering use individual caches.
// Note. It's necessary to multiply by two because routing and rendering use separate caches.
size_t const dataSize = 2 * info.GetColoring().size() * kElementSize;
it->second.m_isLoaded = true;
m_currentCacheSizeBytes += (dataSize - it->second.m_dataSize);

12
routing/routing_tests/applying_traffic_test.cpp
View file

@ -85,10 +85,10 @@ unique_ptr<IndexGraph> BuildXXGraph(shared_ptr<EdgeEstimator> estimator)
return graph;
}
class ApplingTrafficTest
class ApplyingTrafficTest
{
public:
ApplingTrafficTest()
ApplyingTrafficTest()
{
classificator::Load();
m_estimator = EdgeEstimator::CreateForCar(*make_shared<CarModelFactory>()->GetVehicleModel());
@ -98,7 +98,7 @@ public:
};
// Route through XX graph without any traffic info.
UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_EmptyTrafficColoring)
UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_EmptyTrafficColoring)
{
unique_ptr<IndexGraph> graph = BuildXXGraph(m_estimator);
IndexGraphStarter starter(*graph, RoadPoint(1, 0) /* start */, RoadPoint(6, 1) /* finish */);
@ -107,7 +107,7 @@ UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_EmptyTrafficColoring)
}
// Route through XX graph with SpeedGroup::G0 on F3.
UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3)
UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3)
{
TrafficInfo::Coloring coloring = {
{{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
@ -123,7 +123,7 @@ UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3)
}
// Route through XX graph with SpeedGroup::G0 in reverse direction on F3.
UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3ReverseDir)
UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3ReverseDir)
{
TrafficInfo::Coloring coloring = {
{{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kReverseDirection},
@ -139,7 +139,7 @@ UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3ReverseDir)
}
// Route through XX graph SpeedGroup::G1 on F3 and F6, SpeedGroup::G4 on F8 and F4.
UNIT_CLASS_TEST(ApplingTrafficTest, XXGraph_G0onF3andF6andG4onF8andF4)
UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3andF6andG4onF8andF4)
{
TrafficInfo::Coloring coloring = {
{{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},