diff --git a/map/framework.cpp b/map/framework.cpp index 7ebabe3500..c56c531602 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1354,7 +1354,6 @@ void Framework::EnterBackground() SaveViewport(); m_trafficManager.OnEnterBackground(); - m_routingManager.SetAllowSendingPoints(false); // Do not clear caches for Android. This function is called when main activity is paused, // but at the same time search activity (for example) is enabled. @@ -1381,7 +1380,6 @@ void Framework::EnterForeground() } m_trafficManager.OnEnterForeground(); - m_routingManager.SetAllowSendingPoints(true); } void Framework::InitCountryInfoGetter() diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp index d7f1ca3489..4c50c2e0cd 100644 --- a/map/routing_manager.cpp +++ b/map/routing_manager.cpp @@ -306,9 +306,6 @@ drape_ptr CreateDrapeSubroute(vector const & segment RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate) : m_callbacks(move(callbacks)) , m_delegate(delegate) - , m_trackingReporter(platform::CreateSocket(), TRACKING_REALTIME_HOST, TRACKING_REALTIME_PORT, - tracking::Reporter::kPushDelayMs) - , m_trackingReporterArchive(TRACKING_HISTORICAL_HOST) , m_extrapolator( [this](location::GpsInfo const & gpsInfo) { this->OnExtrapolatedLocationUpdate(gpsInfo); }) { @@ -471,14 +468,6 @@ void RoutingManager::OnRoutePointPassed(RouteMarkType type, size_t intermediateI void RoutingManager::OnLocationUpdate(location::GpsInfo const & info) { m_extrapolator.OnLocationUpdate(info); - - if (IsTrackingReporterArchiveEnabled()) - { - location::GpsInfo gpsInfo(info); - auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo); - m_trackingReporterArchive.Insert(m_currentRouterType, info, - m_routingSession.MatchTraffic(routeMatchingInfo)); - } } RouterType RoutingManager::GetBestRouter(m2::PointD const & startPoint, @@ -1120,11 +1109,6 @@ void RoutingManager::CallRouteBuilded(RouterResultCode code, m_routingBuildingCallback(code, absentCountries); } -void RoutingManager::ConfigureArchivalReporter(tracking::ArchivingSettings const & settings) -{ - m_trackingReporterArchive.SetArchivalManagerSettings(settings); -} - void RoutingManager::MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo) { @@ -1239,41 +1223,6 @@ bool RoutingManager::GenerateRouteAltitudeChart(uint32_t width, uint32_t height, return true; } -bool RoutingManager::IsTrackingReporterEnabled() const -{ - auto const & pm = m_callbacks.m_powerManagerGetter(); - if (!pm.IsFacilityEnabled(power_management::Facility::GpsTrackingForTraffic)) - return false; - - if (m_currentRouterType != RouterType::Vehicle) - return false; - - if (!m_routingSession.IsFollowing()) - return false; - - bool enableTracking = true; - settings::TryGet(tracking::Reporter::kEnableTrackingKey, enableTracking); - - return enableTracking; -} - -bool RoutingManager::IsTrackingReporterArchiveEnabled() const -{ - if (m_currentRouterType != RouterType::Vehicle && m_currentRouterType != RouterType::Bicycle && - m_currentRouterType != RouterType::Pedestrian) - { - return false; - } - - if (!m_routingSession.IsFollowing()) - return false; - - bool enableTracking = true; - settings::TryGet(tracking::Reporter::kEnableTrackingKey, enableTracking); - - return enableTracking; -} - void RoutingManager::SetRouter(RouterType type) { CHECK_THREAD_CHECKER(m_threadChecker, ("SetRouter")); @@ -1486,9 +1435,6 @@ void RoutingManager::OnExtrapolatedLocationUpdate(location::GpsInfo const & info auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo); m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, gpsInfo, m_routingSession.IsNavigable(), routeMatchingInfo); - - if (IsTrackingReporterEnabled()) - m_trackingReporter.AddLocation(gpsInfo, m_routingSession.MatchTraffic(routeMatchingInfo)); } void RoutingManager::DeleteSavedRoutePoints() diff --git a/map/routing_manager.hpp b/map/routing_manager.hpp index e1aeca0ff5..8dec587240 100644 --- a/map/routing_manager.hpp +++ b/map/routing_manager.hpp @@ -257,11 +257,6 @@ public: void OnRemoveRoute(routing::RouterResultCode code); void OnRoutePointPassed(RouteMarkType type, size_t intermediateIndex); void OnLocationUpdate(location::GpsInfo const & info); - void SetAllowSendingPoints(bool isAllowed) - { - m_trackingReporter.SetAllowSendingPoints(isAllowed); - } - void ConfigureArchivalReporter(tracking::ArchivingSettings const & settings); routing::SpeedCameraManager & GetSpeedCamManager() { return m_routingSession.GetSpeedCamManager(); } bool IsSpeedLimitExceeded() const; @@ -346,8 +341,6 @@ private: double baseDistance, GetMwmIdFn const & getMwmIdFn, RoadWarningsCollection & roadWarnings); void CreateRoadWarningMarks(RoadWarningsCollection && roadWarnings); - bool IsTrackingReporterEnabled() const; - bool IsTrackingReporterArchiveEnabled() const; /// \returns false if the location could not be matched to the route and should be matched to the /// road graph. Otherwise returns true. void MatchLocationToRoute(location::GpsInfo & info, @@ -380,8 +373,6 @@ private: bool m_loadAltitudes = false; routing::RoutingSession m_routingSession; Delegate & m_delegate; - tracking::Reporter m_trackingReporter; - tracking::ArchivalReporter m_trackingReporterArchive; BookmarkManager * m_bmManager = nullptr; extrapolation::Extrapolator m_extrapolator; diff --git a/private_default.h b/private_default.h index cf93175d7f..966b9f9383 100644 --- a/private_default.h +++ b/private_default.h @@ -15,9 +15,6 @@ #define UBER_SERVER_TOKEN "" #define UBER_CLIENT_ID "" #define OPENTABLE_AFFILATE_ID "" -#define TRACKING_REALTIME_HOST "" -#define TRACKING_REALTIME_PORT 0 -#define TRACKING_HISTORICAL_HOST "" #define TRAFFIC_DATA_BASE_URL "" #define VIATOR_API_KEY_EN "" #define VIATOR_API_KEY_DE "" diff --git a/routing/routing_integration_tests/archival_reporter_tests.cpp b/routing/routing_integration_tests/archival_reporter_tests.cpp index 2e64154438..da7be4baf6 100644 --- a/routing/routing_integration_tests/archival_reporter_tests.cpp +++ b/routing/routing_integration_tests/archival_reporter_tests.cpp @@ -158,6 +158,7 @@ UNIT_TEST(TestArchivalReporter_DeleteOldData) // ArchivalReporter pipeline with no dumping. // Checks behaviour if there is no free space on device. +/* UNIT_CLASS_TEST(TestArchivalReporter, FreeSpaceOnDisk) { tracking::ArchivingSettings settings; @@ -171,4 +172,6 @@ UNIT_CLASS_TEST(TestArchivalReporter, FreeSpaceOnDisk) TEST_EQUAL(GetFilesCount(m_tracksDir), 0, ()); } } +*/ + } // namespace