kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2018-05-28 15:57:15 +03:00 • committed by mpimenov
parent 7d1bec2c91
commit b9edf52a71
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/extrapolation/extrapolator.cpp
View file

@ -127,7 +127,7 @@ void Extrapolator::ExtrapolatedLocationUpdate()
{
lock_guard<mutex> guard(m_mutex);
if (m_extrapolationCounter != m_extrapolationCounterUndefined)
if (m_extrapolationCounter != kExtrapolationCounterUndefined)
++m_extrapolationCounter;
}
@ -145,7 +145,7 @@ bool Extrapolator::DoesExtrapolationWork(uint64_t extrapolationTimeMs) const
// It may happen in rare cases because GpsInfo::m_timestamp is not monotonic generally.
// Please see comment in declaration of class GpsInfo for details.
if (!m_isEnabled || m_extrapolationCounter == m_extrapolationCounterUndefined ||
if (!m_isEnabled || m_extrapolationCounter == kExtrapolationCounterUndefined ||
!m_lastGpsInfo.IsValid() || !m_beforeLastGpsInfo.IsValid() ||
m_beforeLastGpsInfo.m_timestamp >= m_lastGpsInfo.m_timestamp)
{

6
map/extrapolation/extrapolator.hpp
View file

@ -17,11 +17,11 @@ location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1,
class Extrapolator
{
static uint64_t constexpr kExtrapolationCounterUndefined = std::numeric_limits<uint64_t>::max();
public:
using ExtrapolatedLocationUpdateFn = std::function<void(location::GpsInfo const &)>;
static uint64_t constexpr m_extrapolationCounterUndefined = std::numeric_limits<uint64_t>::max();
/// \param update is a function which is called with params according to extrapolated position.
/// |update| will be called on gui thread.
explicit Extrapolator(ExtrapolatedLocationUpdateFn const & update);
@ -43,6 +43,6 @@ private:
ExtrapolatedLocationUpdateFn m_extrapolatedLocationUpdate;
location::GpsInfo m_lastGpsInfo;
location::GpsInfo m_beforeLastGpsInfo;
uint64_t m_extrapolationCounter = m_extrapolationCounterUndefined;
uint64_t m_extrapolationCounter = kExtrapolationCounterUndefined;
};
} // namespace extrapolation

2
map/routing_manager.cpp
View file

@ -1243,7 +1243,7 @@ void RoutingManager::OnExtrapolatedLocationUpdate(location::GpsInfo const & info
{
location::GpsInfo gpsInfo(info);
if (!m_drapeEngine)
m_gpsInfoCache = my::make_unique<location::GpsInfo>(gpsInfo);
m_gpsInfoCache = make_unique<location::GpsInfo>(gpsInfo);
auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo);
m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, gpsInfo,