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

[tracking] Uncomment archival reporter.

Browse source
This commit is contained in:
Olga Khlopkova 2019-12-27 11:32:23 +03:00 • committed by gmoryes
parent 59241781c1
commit a958806294
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
map/routing_manager.cpp
View file

@ -314,8 +314,10 @@ RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
, m_delegate(delegate)
, m_trackingReporter(platform::CreateSocket(), TRACKING_REALTIME_HOST, TRACKING_REALTIME_PORT,
tracking::Reporter::kPushDelayMs)
// TODO(o.khlopkova) uncomment after platform background uploader is ready.
//, m_trackingReporterArchive(TRACKING_HISTORICAL_HOST)
//TODO (o.khlopkova) remove ifdef when all platforms are ready.
#if defined(OMIM_OS_ANDROID)
, m_trackingReporterArchive(TRACKING_HISTORICAL_HOST)
#endif
, m_extrapolator(
[this](location::GpsInfo const & gpsInfo) { this->OnExtrapolatedLocationUpdate(gpsInfo); })
{
@ -484,14 +486,16 @@ void RoutingManager::OnLocationUpdate(location::GpsInfo const & info)
{
m_extrapolator.OnLocationUpdate(info);
//TODO (o.khlopkova) remove ifdef when all platforms are ready.
#if defined(OMIM_OS_ANDROID)
if (IsTrackingReporterArchiveEnabled())
{
// TODO(o.khlopkova) uncomment after platform background uploader is ready.
// location::GpsInfo gpsInfo(info);
// auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo);
// m_trackingReporterArchive.Insert(m_currentRouterType, info,
// m_routingSession.MatchTraffic(routeMatchingInfo));
location::GpsInfo gpsInfo(info);
auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo);
m_trackingReporterArchive.Insert(m_currentRouterType, info,
m_routingSession.MatchTraffic(routeMatchingInfo));
}
#endif
}
RouterType RoutingManager::GetBestRouter(m2::PointD const & startPoint,

8
map/routing_manager.hpp
View file

@ -26,6 +26,8 @@
#include "base/thread_checker.hpp"
#include "std/target_os.hpp"
#include <chrono>
#include <functional>
#include <map>
@ -367,8 +369,10 @@ private:
routing::RoutingSession m_routingSession;
Delegate & m_delegate;
tracking::Reporter m_trackingReporter;
// TODO(o.khlopkova) uncomment after platform background uploader is ready.
// tracking::ArchivalReporter m_trackingReporterArchive;
// TODO(o.khlopkova) remove ifdef when all platforms are ready.
#if defined(OMIM_OS_ANDROID)
tracking::ArchivalReporter m_trackingReporterArchive;
#endif
BookmarkManager * m_bmManager = nullptr;
extrapolation::Extrapolator m_extrapolator;