diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 79fc7d52d8..916ed90344 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -464,8 +464,7 @@ extern "C" CallOnMapObjectActivatedListener(obj, mapObject.get()); } - // TODO (gardster or trashkalmar): Remove absentRoutes param after core is modified - void CallRoutingListener(shared_ptr listener, int errorCode, vector const & absentMaps, vector const & absentRoutes) + void CallRoutingListener(shared_ptr listener, int errorCode, vector const & absentMaps) { JNIEnv * env = jni::GetEnv(); jmethodID const method = jni::GetMethodID(env, *listener, "onRoutingEvent", "(I[Ljava/lang/String;)V"); @@ -837,7 +836,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_mapswithme_maps_Framework_nativeSetRoutingListener(JNIEnv * env, jobject thiz, jobject listener) { - frm()->SetRouteBuildingListener(bind(&CallRoutingListener, jni::make_global_ref(listener), _1, _2, _3)); + frm()->SetRouteBuildingListener(bind(&CallRoutingListener, jni::make_global_ref(listener), _1, _2)); } JNIEXPORT void JNICALL diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h index 9f1bd95791..a453094c05 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h @@ -11,7 +11,6 @@ - (nonnull instancetype)initWithViewController:(nonnull UIViewController *)viewController; - (void)presentAlert:(routing::IRouter::ResultCode)type; - (void)presentDownloaderAlertWithCountries:(storage::TCountriesVec const &)countries - routes:(storage::TCountriesVec const &)routes code:(routing::IRouter::ResultCode)code okBlock:(nonnull TMWMVoidBlock)okBlock; - (void)presentRateAlert; diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index 21c956ed4b..5b419425eb 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -102,11 +102,10 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController } - (void)presentDownloaderAlertWithCountries:(storage::TCountriesVec const &)countries - routes:(storage::TCountriesVec const &)routes code:(routing::IRouter::ResultCode)code okBlock:(TMWMVoidBlock)okBlock { - [self displayAlert:[MWMAlert downloaderAlertWithAbsentCountries:countries routes:routes code:code okBlock:okBlock]]; + [self displayAlert:[MWMAlert downloaderAlertWithAbsentCountries:countries code:code okBlock:okBlock]]; } - (void)presentRoutingDisclaimerAlert diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h index a3d084841c..1f8c98bde1 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h @@ -8,7 +8,6 @@ + (MWMAlert *)alert:(routing::IRouter::ResultCode)type; + (MWMAlert *)downloaderAlertWithAbsentCountries:(storage::TCountriesVec const &)countries - routes:(storage::TCountriesVec const &)routes code:(routing::IRouter::ResultCode)code okBlock:(TMWMVoidBlock)okBlock; + (MWMAlert *)rateAlert; diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index f998602ec6..63756a39f5 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -57,11 +57,10 @@ } + (MWMAlert *)downloaderAlertWithAbsentCountries:(storage::TCountriesVec const &)countries - routes:(storage::TCountriesVec const &)routes code:(routing::IRouter::ResultCode)code okBlock:(TMWMVoidBlock)okBlock { - return [MWMDownloadTransitMapAlert downloaderAlertWithMaps:countries routes:routes code:code okBlock:okBlock]; + return [MWMDownloadTransitMapAlert downloaderAlertWithMaps:countries code:code okBlock:okBlock]; } + (MWMAlert *)alert:(routing::IRouter::ResultCode)type diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.h b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.h index 25e1a97098..8aefb9d98c 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.h +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.h @@ -6,7 +6,6 @@ @interface MWMDownloadTransitMapAlert : MWMAlert + (instancetype)downloaderAlertWithMaps:(storage::TCountriesVec const &)maps - routes:(storage::TCountriesVec const &)routes code:(routing::IRouter::ResultCode)code okBlock:(TMWMVoidBlock)okBlock; - (void)showDownloadDetail:(UIButton *)sender; diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm index fddc6dc0ff..519e64bcdf 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm @@ -65,7 +65,6 @@ static NSString * const kStatisticsEvent = @"Map download Alert"; @interface MWMDownloadTransitMapAlert () { storage::TCountriesVec maps; - storage::TCountriesVec routes; } @property (weak, nonatomic) IBOutlet UILabel * titleLabel; @@ -87,12 +86,11 @@ static NSString * const kStatisticsEvent = @"Map download Alert"; @implementation MWMDownloadTransitMapAlert + (instancetype)downloaderAlertWithMaps:(storage::TCountriesVec const &)maps - routes:(storage::TCountriesVec const &)routes code:(routing::IRouter::ResultCode)code okBlock:(TMWMVoidBlock)okBlock { [[Statistics instance] logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatOpen}]; - MWMDownloadTransitMapAlert * alert = [self alertWithMaps:maps routes:routes]; + MWMDownloadTransitMapAlert * alert = [self alertWithMaps:maps]; switch (code) { case routing::IRouter::InconsistentMWMandRoute: @@ -117,7 +115,7 @@ static NSString * const kStatisticsEvent = @"Map download Alert"; return alert; } -+ (instancetype)alertWithMaps:(storage::TCountriesVec const &)maps routes:(storage::TCountriesVec const &)routes ++ (instancetype)alertWithMaps:(storage::TCountriesVec const &)maps { MWMDownloadTransitMapAlert * alert = [[[NSBundle mainBundle] loadNibNamed:kDownloadTransitMapAlertNibName owner:nil options:nil] firstObject]; NSMutableArray * missedFiles = [@[] mutableCopy]; @@ -126,14 +124,8 @@ static NSString * const kStatisticsEvent = @"Map download Alert"; MWMDownloaderEntity * entity = [[MWMDownloaderEntity alloc] initWithIndexes:maps isMaps:YES]; [missedFiles addObject:entity]; } - if (!routes.empty()) - { - MWMDownloaderEntity * entity = [[MWMDownloaderEntity alloc] initWithIndexes:routes isMaps:NO]; - [missedFiles addObject:entity]; - } alert.missedFiles = missedFiles; alert->maps = maps; - alert->routes = routes; [alert configure]; return alert; } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index c1ca5ac892..6187ca26a0 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -78,7 +78,6 @@ extern NSString * const kAlohalyticsTapEventKey; - (void)processRouteBuilderEvent:(routing::IRouter::ResultCode)code countries:(storage::TCountriesVec const &)absentCountries - routes:(storage::TCountriesVec const &)absentRoutes { switch (code) { diff --git a/iphone/Maps/Classes/Framework/MWMFrameworkListener.mm b/iphone/Maps/Classes/Framework/MWMFrameworkListener.mm index 2ac0c91d4f..0f7b03ec40 100644 --- a/iphone/Maps/Classes/Framework/MWMFrameworkListener.mm +++ b/iphone/Maps/Classes/Framework/MWMFrameworkListener.mm @@ -109,11 +109,11 @@ void loopWrappers(TObservers * observers, TLoopBlock block) using namespace storage; TObservers * observers = self.routeBuildingObservers; auto & f = GetFramework(); - f.SetRouteBuildingListener([observers](IRouter::ResultCode code, TCountriesVec const & absentCountries, TCountriesVec const & absentRoutes) + f.SetRouteBuildingListener([observers](IRouter::ResultCode code, TCountriesVec const & absentCountries) { - loopWrappers(observers, [code, absentCountries, absentRoutes](TRouteBuildingObserver observer) + loopWrappers(observers, [code, absentCountries](TRouteBuildingObserver observer) { - [observer processRouteBuilderEvent:code countries:absentCountries routes:absentRoutes]; + [observer processRouteBuilderEvent:code countries:absentCountries]; }); }); f.SetRouteProgressListener([observers](float progress) diff --git a/iphone/Maps/Classes/Framework/MWMFrameworkObservers.h b/iphone/Maps/Classes/Framework/MWMFrameworkObservers.h index c11d20fc30..ee329d2a38 100644 --- a/iphone/Maps/Classes/Framework/MWMFrameworkObservers.h +++ b/iphone/Maps/Classes/Framework/MWMFrameworkObservers.h @@ -13,8 +13,7 @@ using namespace storage; @protocol MWMFrameworkRouteBuilderObserver - (void)processRouteBuilderEvent:(routing::IRouter::ResultCode)code - countries:(TCountriesVec const &)absentCountries - routes:(TCountriesVec const &)absentRoutes; + countries:(storage::TCountriesVec const &)absentCountries; @optional diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 47a7a85411..c5fb8856ca 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -547,7 +547,6 @@ NSString * const kEditorSegue = @"Map2EditorSegue"; - (void)processRouteBuilderEvent:(routing::IRouter::ResultCode)code countries:(storage::TCountriesVec const &)absentCountries - routes:(storage::TCountriesVec const &)absentRoutes { switch (code) { @@ -574,13 +573,11 @@ NSString * const kEditorSegue = @"Map2EditorSegue"; case routing::IRouter::FileTooOld: case routing::IRouter::RouteNotFound: { - [self presentDownloaderAlert:code countries:absentCountries routes:absentRoutes okBlock:[=] + [self presentDownloaderAlert:code countries:absentCountries okBlock:[=] { auto & s = GetFramework().Storage(); for (auto const & countryId : absentCountries) s.DownloadNode(countryId); - for (auto const & countryId : absentRoutes) - s.DownloadNode(countryId); [self openMapsDownloader]; }]; break; @@ -717,11 +714,10 @@ NSString * const kEditorSegue = @"Map2EditorSegue"; - (void)presentDownloaderAlert:(routing::IRouter::ResultCode)code countries:(storage::TCountriesVec const &)countries - routes:(storage::TCountriesVec const &)routes okBlock:(TMWMVoidBlock)okBlock { - if (countries.size() || routes.size()) - [self.alertController presentDownloaderAlertWithCountries:countries routes:routes code:code okBlock:okBlock]; + if (countries.size()) + [self.alertController presentDownloaderAlertWithCountries:countries code:code okBlock:okBlock]; else [self presentDefaultAlert:code]; } diff --git a/map/framework.cpp b/map/framework.cpp index 1d5382bedb..45fd876030 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -1920,7 +1920,7 @@ void Framework::BuildRoute(m2::PointD const & finish, uint32_t timeoutSec) m2::PointD start; if (!m_drapeEngine->GetMyPosition(start)) { - CallRouteBuilded(IRouter::NoCurrentPosition, storage::TCountriesVec(), storage::TCountriesVec()); + CallRouteBuilded(IRouter::NoCurrentPosition, storage::TCountriesVec()); return; } @@ -1941,7 +1941,6 @@ void Framework::BuildRoute(m2::PointD const & start, m2::PointD const & finish, auto readyCallback = [this] (Route const & route, IRouter::ResultCode code) { storage::TCountriesVec absentCountries; - storage::TCountriesVec absentRoutingIndexes; if (code == IRouter::NoError) { double const kRouteScaleMultiplier = 1.5; @@ -1953,19 +1952,12 @@ void Framework::BuildRoute(m2::PointD const & start, m2::PointD const & finish, } else { - for (string const & name : route.GetAbsentCountries()) - { - storage::TCountryId fileCountryId = name; - if (m_storage.GetLatestLocalFile(fileCountryId)) - absentRoutingIndexes.push_back(fileCountryId); - else - absentCountries.push_back(fileCountryId); - } + absentCountries.assign(route.GetAbsentCountries().begin(), route.GetAbsentCountries().end()); if (code != IRouter::NeedMoreMaps) RemoveRoute(true /* deactivateFollowing */); } - CallRouteBuilded(code, absentCountries, absentRoutingIndexes); + CallRouteBuilded(code, absentCountries); }; m_routingSession.BuildRoute(start, finish, readyCallback, m_progressCallback, timeoutSec); @@ -2028,13 +2020,13 @@ void Framework::SetRouterImpl(RouterType type) } else { - auto localFileGetter = [this](string const & countryFile) -> shared_ptr + auto localFileChecker = [this](string const & countryFile) -> bool { - return m_storage.GetLatestLocalFile(CountryFile(countryFile)); + return m_model.GetIndex().GetMwmIdByCountryFile(CountryFile(countryFile)).IsAlive(); }; router.reset(new OsrmRouter(&m_model.GetIndex(), countryFileGetter)); - fetcher.reset(new OnlineAbsentCountriesFetcher(countryFileGetter, localFileGetter)); + fetcher.reset(new OnlineAbsentCountriesFetcher(countryFileGetter, localFileChecker)); m_routingSession.SetRoutingSettings(routing::GetCarRoutingSettings()); } @@ -2113,12 +2105,11 @@ void Framework::MatchLocationToRoute(location::GpsInfo & location, location::Rou m_routingSession.MatchLocationToRoute(location, routeMatchingInfo); } -void Framework::CallRouteBuilded(IRouter::ResultCode code, storage::TCountriesVec const & absentCountries, - storage::TCountriesVec const & absentRoutingFiles) +void Framework::CallRouteBuilded(IRouter::ResultCode code, storage::TCountriesVec const & absentCountries) { if (code == IRouter::Cancelled) return; - m_routingCallback(code, absentCountries, absentRoutingFiles); + m_routingCallback(code, absentCountries); } string Framework::GetRoutingErrorMessage(IRouter::ResultCode code) diff --git a/map/framework.hpp b/map/framework.hpp index 796e618084..8f39f49454 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -517,7 +517,6 @@ public: public: using TRouteBuildingCallback = function; using TRouteProgressCallback = function; @@ -584,8 +583,7 @@ private: void InsertRoute(routing::Route const & route); void CheckLocationForRouting(location::GpsInfo const & info); void CallRouteBuilded(routing::IRouter::ResultCode code, - storage::TCountriesVec const & absentCountries, - storage::TCountriesVec const & absentRoutingFiles); + storage::TCountriesVec const & absentCountries); void MatchLocationToRoute(location::GpsInfo & info, location::RouteMatchingInfo & routeMatchingInfo) const; string GetRoutingErrorMessage(routing::IRouter::ResultCode code); diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index f62c8d5c19..2aa6b14968 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -94,7 +94,6 @@ DrawWidget::DrawWidget(QWidget * parent) }); m_framework->SetRouteBuildingListener([](routing::IRouter::ResultCode, - storage::TCountriesVec const &, storage::TCountriesVec const &) { }); diff --git a/routing/online_absent_fetcher.cpp b/routing/online_absent_fetcher.cpp index dd707e6dec..9186a239c6 100644 --- a/routing/online_absent_fetcher.cpp +++ b/routing/online_absent_fetcher.cpp @@ -38,8 +38,7 @@ void OnlineAbsentCountriesFetcher::GetAbsentCountries(vector & countries for (auto const & point : m_fetcherThread->GetRoutineAs()->GetMwmPoints()) { string name = m_countryFileFn(point); - auto localFile = m_countryLocalFileFn(name); - if (localFile && HasOptions(localFile->GetFiles(), MapOptions::MapWithCarRouting)) + if (m_countryLocalFileFn(name)) continue; LOG(LINFO, ("Needs: ", name)); diff --git a/routing/online_absent_fetcher.hpp b/routing/online_absent_fetcher.hpp index 0a91cd841b..dc8791e7d9 100644 --- a/routing/online_absent_fetcher.hpp +++ b/routing/online_absent_fetcher.hpp @@ -12,7 +12,7 @@ namespace routing { -using TCountryLocalFileFn = function(string const &)>; +using TCountryLocalFileFn = function; class IOnlineFetcher { diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/routing/routing_integration_tests/routing_test_tools.cpp index 35b82d5af4..bf3d8dd7f7 100644 --- a/routing/routing_integration_tests/routing_test_tools.cpp +++ b/routing/routing_integration_tests/routing_test_tools.cpp @@ -271,13 +271,13 @@ namespace integration { return routerComponents.GetCountryInfoGetter().GetRegionCountryId(p); }; - auto localFileGetter = - [&routerComponents](string const & countryFile) -> shared_ptr + auto localFileChecker = + [&routerComponents](string const & /* countryFile */) -> bool { - // Always returns empty LocalCountryFile. - return make_shared(); + // Always returns that the file is absent. + return false; }; - routing::OnlineAbsentCountriesFetcher fetcher(countryFileGetter, localFileGetter); + routing::OnlineAbsentCountriesFetcher fetcher(countryFileGetter, localFileChecker); fetcher.GenerateRequest(MercatorBounds::FromLatLon(startPoint), MercatorBounds::FromLatLon(finalPoint)); vector absent;