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

Remove redundant absent maps parameter.

Browse source
This commit is contained in:
Lev Dragunov 2016-02-25 16:22:37 +03:00 • committed by Sergey Yershov
parent edfa64a3f9
commit 7f050eb375
17 changed files with 29 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -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<jobject> listener, int errorCode, vector<storage::TCountryId> const & absentMaps, vector<storage::TCountryId> const & absentRoutes)
void CallRoutingListener(shared_ptr<jobject> listener, int errorCode, vector<storage::TCountryId> 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

1
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
View file

@ -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;

3
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
View file

@ -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

1
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
View file

@ -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;

3
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
View file

@ -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

1
iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.h
View file

@ -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;

12
iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm
View file

@ -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;
}

1
iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
View file

@ -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)
{

6
iphone/Maps/Classes/Framework/MWMFrameworkListener.mm
View file

@ -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)

3
iphone/Maps/Classes/Framework/MWMFrameworkObservers.h
View file

@ -13,8 +13,7 @@ using namespace storage;
@protocol MWMFrameworkRouteBuilderObserver <MWMFrameworkObserver>
- (void)processRouteBuilderEvent:(routing::IRouter::ResultCode)code
countries:(TCountriesVec const &)absentCountries
routes:(TCountriesVec const &)absentRoutes;
countries:(storage::TCountriesVec const &)absentCountries;
@optional

10
iphone/Maps/Classes/MapViewController.mm
View file

@ -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];
}

25
map/framework.cpp
View file

@ -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<LocalCountryFile>
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)

4
map/framework.hpp
View file

@ -517,7 +517,6 @@ public:
public:
using TRouteBuildingCallback = function<void(routing::IRouter::ResultCode,
storage::TCountriesVec const &,
storage::TCountriesVec const &)>;
using TRouteProgressCallback = function<void(float)>;
@ -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);

1
qt/draw_widget.cpp
View file

@ -94,7 +94,6 @@ DrawWidget::DrawWidget(QWidget * parent)
});
m_framework->SetRouteBuildingListener([](routing::IRouter::ResultCode,
storage::TCountriesVec const &,
storage::TCountriesVec const &)
{
});

3
routing/online_absent_fetcher.cpp
View file

@ -38,8 +38,7 @@ void OnlineAbsentCountriesFetcher::GetAbsentCountries(vector<string> & countries
for (auto const & point : m_fetcherThread->GetRoutineAs<OnlineCrossFetcher>()->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));

2
routing/online_absent_fetcher.hpp
View file

@ -12,7 +12,7 @@
namespace routing
{
using TCountryLocalFileFn = function<shared_ptr<platform::LocalCountryFile>(string const &)>;
using TCountryLocalFileFn = function<bool(string const &)>;
class IOnlineFetcher
{

10
routing/routing_integration_tests/routing_test_tools.cpp
View file

@ -271,13 +271,13 @@ namespace integration
{
return routerComponents.GetCountryInfoGetter().GetRegionCountryId(p);
};
auto localFileGetter =
[&routerComponents](string const & countryFile) -> shared_ptr<LocalCountryFile>
auto localFileChecker =
[&routerComponents](string const & /* countryFile */) -> bool
{
// Always returns empty LocalCountryFile.
return make_shared<LocalCountryFile>();
// 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<string> absent;