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-03 14:14:51 +03:00
parent 3f7b61e52e
commit 0b43dc9d8d
13 changed files with 94 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
map/traffic_manager.cpp
View file

@ -192,7 +192,7 @@ void TrafficManager::ThreadRoutine()
else
{
LOG(LWARNING, ("Traffic request failed. Mwm =", mwm));
OnTrafficRequestFailed(info);
OnTrafficRequestFailed(move(info));
}
}
mwms.clear();
@ -271,7 +271,7 @@ void TrafficManager::RequestTrafficData(MwmSet::MwmId const & mwmId)
m_condition.notify_one();
}
void TrafficManager::OnTrafficRequestFailed(traffic::TrafficInfo const & info)
void TrafficManager::OnTrafficRequestFailed(traffic::TrafficInfo && info)
{
lock_guard<mutex> lock(m_mutex);
@ -320,8 +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 separate caches.
size_t const dataSize = 2 * info.GetColoring().size() * kElementSize;
size_t const dataSize = info.GetColoring().size() * kElementSize;
m_currentCacheSizeBytes += (dataSize - it->second.m_dataSize);
it->second.m_dataSize = dataSize;
CheckCacheSize();
@ -353,8 +352,8 @@ void TrafficManager::CheckCacheSize()
auto const it = m_mwmCache.find(mwmId);
if (it->second.m_isLoaded)
{
// Note. It's necessary to multiply by two because routing and rendering use separate caches.
m_currentCacheSizeBytes -= 2 * it->second.m_dataSize;
ASSERT_GREATER_OR_EQUAL(m_currentCacheSizeBytes, it->second.m_dataSize, ());
m_currentCacheSizeBytes -= it->second.m_dataSize;
m_drapeEngine->ClearTrafficCache(mwmId);
m_observer.OnTrafficInfoRemoved(mwmId);
}

2
map/traffic_manager.hpp
View file

@ -78,7 +78,7 @@ private:
bool WaitForRequest(vector<MwmSet::MwmId> & mwms);
void OnTrafficDataResponse(traffic::TrafficInfo && info);
void OnTrafficRequestFailed(traffic::TrafficInfo const & info);
void OnTrafficRequestFailed(traffic::TrafficInfo && info);
private:
// This is a group of methods that haven't their own synchronization inside.

8
routing/edge_estimator.cpp
View file

@ -76,15 +76,15 @@ double CarEdgeEstimator::CalcEdgesWeight(uint32_t featureId, RoadGeometry const
: TrafficInfo::RoadSegmentId::kReverseDirection;
for (uint32_t i = start; i < finish; ++i)
{
double factor = 1.0;
double edgeWeight = TimeBetweenSec(road.GetPoint(i), road.GetPoint(i + 1), speedMPS);
if (m_trafficInfo)
{
SpeedGroup const speedGroup =
m_trafficInfo->GetSpeedGroup(TrafficInfo::RoadSegmentId(featureId, i, dir));
CHECK_LESS(speedGroup, SpeedGroup::Count, ());
factor = CalcTrafficFactor(speedGroup);
ASSERT_LESS(speedGroup, SpeedGroup::Count, ());
edgeWeight *= CalcTrafficFactor(speedGroup);
}
result += factor * TimeBetweenSec(road.GetPoint(i), road.GetPoint(i + 1), speedMPS);
result += edgeWeight;
}
return result;

16
routing/edge_estimator.hpp
View file

@ -3,7 +3,7 @@
#include "routing/geometry.hpp"
#include "routing/vehicle_model.hpp"
#include "traffic/traffic_info.hpp"
#include "traffic/traffic_info_getter.hpp"
#include "indexer/mwm_set.hpp"
@ -29,18 +29,4 @@ public:
static shared_ptr<EdgeEstimator> CreateForCar(IVehicleModel const & vehicleModel,
traffic::TrafficInfoGetter const & getter);
};
class EstimatorGuard final
{
public:
EstimatorGuard(MwmSet::MwmId const & mwmId, EdgeEstimator & estimator) : m_estimator(estimator)
{
m_estimator.Start(mwmId);
}
~EstimatorGuard() { m_estimator.Finish(); }
private:
EdgeEstimator & m_estimator;
};
} // namespace routing

19
routing/routing_session.cpp
View file

@ -49,25 +49,6 @@ uint32_t constexpr kMinimumETASec = 60;
namespace routing
{
void TrafficCache::Set(TrafficInfo && info)
{
MwmSet::MwmId const mwmId = info.GetMwmId();
m_trafficInfo[mwmId] = make_shared<TrafficInfo>(move(info));
}
void TrafficCache::Remove(MwmSet::MwmId const & mwmId) { m_trafficInfo.erase(mwmId); }
shared_ptr<TrafficInfo> TrafficCache::Get(MwmSet::MwmId const & mwmId) const
{
auto it = m_trafficInfo.find(mwmId);
if (it == m_trafficInfo.cend())
return shared_ptr<TrafficInfo>();
return it->second;
}
void TrafficCache::Clear() { m_trafficInfo.clear(); }
RoutingSession::RoutingSession()
: m_router(nullptr)
, m_route(make_shared<Route>(string()))

15
routing/routing_session.hpp
View file

@ -7,6 +7,7 @@
#include "routing/turns_notification_manager.hpp"
#include "traffic/traffic_info.hpp"
#include "traffic/traffic_info_getter.hpp"
#include "platform/location.hpp"
#include "platform/measurement_utils.hpp"
@ -38,18 +39,6 @@ struct SpeedCameraRestriction
SpeedCameraRestriction() : m_index(0), m_maxSpeedKmH(numeric_limits<uint8_t>::max()) {}
};
class TrafficCache
{
public:
void Set(traffic::TrafficInfo && info);
void Remove(MwmSet::MwmId const & mwmId);
shared_ptr<traffic::TrafficInfo> Get(MwmSet::MwmId const & mwmId) const;
void Clear();
private:
map<MwmSet::MwmId, shared_ptr<traffic::TrafficInfo>> m_trafficInfo;
};
class RoutingSession : public traffic::TrafficObserver, public traffic::TrafficInfoGetter
{
friend void UnitTest_TestFollowRoutePercentTest();
@ -203,7 +192,7 @@ private:
double GetCompletionPercent() const;
private:
TrafficCache m_trafficCache;
traffic::TrafficCache m_trafficCache;
unique_ptr<AsyncRouter> m_router;
shared_ptr<Route> m_route;
atomic<State> m_state;

10
routing/routing_tests/applying_traffic_test.cpp
View file

@ -89,11 +89,6 @@ unique_ptr<IndexGraph> BuildXXGraph(shared_ptr<EdgeEstimator> estimator)
class TrafficInfoGetterForTesting : public TrafficInfoGetter
{
public:
TrafficInfoGetterForTesting(TrafficInfo && trafficInfo)
{
m_trafficCache.Set(move(trafficInfo));
}
// TrafficInfoGetter overrides:
shared_ptr<traffic::TrafficInfo> GetTrafficInfo(MwmSet::MwmId const & mwmId) const override
{
@ -113,7 +108,8 @@ public:
void SetEstimator(TrafficInfo::Coloring && coloring)
{
m_trafficGetter = make_unique<TrafficInfoGetterForTesting>(move(coloring));
m_trafficGetter = make_unique<TrafficInfoGetterForTesting>();
UpdateTrafficInfo(move(coloring));
m_estimator = EdgeEstimator::CreateForCar(*make_shared<CarModelFactory>()->GetVehicleModel(),
*m_trafficGetter);
}
@ -122,7 +118,7 @@ public:
void UpdateTrafficInfo(TrafficInfo::Coloring && coloring)
{
m_trafficGetter->UpdateTrafficInfo(TrafficInfo(move(coloring)));
m_trafficGetter->UpdateTrafficInfo(TrafficInfo::BuildForTesting(move(coloring)));
}
private:

14
routing/single_mwm_router.cpp
View file

@ -29,6 +29,20 @@ size_t constexpr kMaxRoadCandidates = 6;
float constexpr kProgressInterval = 2;
uint32_t constexpr kDrawPointsPeriod = 10;
class EstimatorGuard final
{
public:
EstimatorGuard(MwmSet::MwmId const & mwmId, EdgeEstimator & estimator) : m_estimator(estimator)
{
m_estimator.Start(mwmId);
}
~EstimatorGuard() { m_estimator.Finish(); }
private:
EdgeEstimator & m_estimator;
};
vector<Junction> ConvertToJunctions(IndexGraphStarter & starter, vector<Joint::Id> const & joints)
{
vector<RoadPoint> roadPoints;

2
traffic/traffic.pro
View file

@ -9,7 +9,9 @@ include($$ROOT_DIR/common.pri)
SOURCES += \
speed_groups.cpp \
traffic_info.cpp \
traffic_info_getter.cpp \
HEADERS += \
speed_groups.hpp \
traffic_info.hpp \
traffic_info_getter.hpp \

8
traffic/traffic_info.cpp
View file

@ -84,6 +84,14 @@ TrafficInfo::TrafficInfo(TrafficInfo && info)
, m_currentDataVersion(info.m_currentDataVersion)
{}
// static
TrafficInfo TrafficInfo::BuildForTesting(Coloring && coloring)
{
TrafficInfo info;
info.m_coloring = move(coloring);
return info;
}
bool TrafficInfo::ReceiveTrafficData()
{
auto const & info = m_mwmId.GetInfo();

11
traffic/traffic_info.hpp
View file

@ -70,8 +70,7 @@ public:
TrafficInfo(TrafficInfo && info);
// For testing only.
TrafficInfo(Coloring && coloring) : m_coloring(move(coloring)) {}
static TrafficInfo BuildForTesting(Coloring && coloring);
// Fetches the latest traffic data from the server and updates the coloring.
// Construct the url by passing an MwmId.
@ -106,12 +105,4 @@ public:
virtual void OnTrafficInfoAdded(traffic::TrafficInfo && info) = 0;
virtual void OnTrafficInfoRemoved(MwmSet::MwmId const & mwmId) = 0;
};
class TrafficInfoGetter
{
public:
virtual ~TrafficInfoGetter() = default;
virtual shared_ptr<traffic::TrafficInfo> GetTrafficInfo(MwmSet::MwmId const & mwmId) const = 0;
};
} // namespace traffic

23
traffic/traffic_info_getter.cpp Normal file
View file

@ -0,0 +1,23 @@
#include "traffic/traffic_info_getter.hpp"
namespace traffic
{
void TrafficCache::Set(TrafficInfo && info)
{
MwmSet::MwmId const mwmId = info.GetMwmId();
m_trafficInfo[mwmId] = make_shared<TrafficInfo>(move(info));
}
void TrafficCache::Remove(MwmSet::MwmId const & mwmId) { m_trafficInfo.erase(mwmId); }
shared_ptr<TrafficInfo> TrafficCache::Get(MwmSet::MwmId const & mwmId) const
{
auto it = m_trafficInfo.find(mwmId);
if (it == m_trafficInfo.cend())
return shared_ptr<TrafficInfo>();
return it->second;
}
void TrafficCache::Clear() { m_trafficInfo.clear(); }
} // namespace traffic

30
traffic/traffic_info_getter.hpp Normal file
View file

@ -0,0 +1,30 @@
#pragma once
#include "traffic/traffic_info.hpp"
#include "indexer/mwm_set.hpp"
#include "std/map.hpp"
#include "std/shared_ptr.hpp"
namespace traffic
{
class TrafficInfoGetter
{
public:
virtual ~TrafficInfoGetter() = default;
virtual shared_ptr<traffic::TrafficInfo> GetTrafficInfo(MwmSet::MwmId const & mwmId) const = 0;
};
class TrafficCache final
{
public:
void Set(traffic::TrafficInfo && info);
void Remove(MwmSet::MwmId const & mwmId);
shared_ptr<traffic::TrafficInfo> Get(MwmSet::MwmId const & mwmId) const;
void Clear();
private:
map<MwmSet::MwmId, shared_ptr<traffic::TrafficInfo>> m_trafficInfo;
};
} // namespace traffic