forked from organicmaps/organicmaps-tmp
[new downloader][ios] Fixed migration from map on zoomin.
This commit is contained in:
parent
364bda91c8
commit
37b434bdf8
3 changed files with 15 additions and 4 deletions
|
@ -102,7 +102,8 @@ NSString * const kEditorSegue = @"Map2EditorSegue";
|
|||
@end
|
||||
|
||||
@interface MapViewController ()<MTRGNativeAppwallAdDelegate, MWMFrameworkRouteBuilderObserver,
|
||||
MWMFrameworkMyPositionObserver, MWMFrameworkUserMarkObserver>
|
||||
MWMFrameworkMyPositionObserver, MWMFrameworkUserMarkObserver,
|
||||
MWMFrameworkDrapeObserver>
|
||||
|
||||
@property (nonatomic, readwrite) MWMMapViewControlsManager * controlsManager;
|
||||
@property (nonatomic) MWMBottomMenuState menuRestoreState;
|
||||
|
@ -593,6 +594,16 @@ NSString * const kEditorSegue = @"Map2EditorSegue";
|
|||
self.forceRoutingStateChange = ForceRoutingStateChangeNone;
|
||||
}
|
||||
|
||||
#pragma mark - MWMFrameworkDrapeObserver
|
||||
|
||||
- (void)processViewportCountryEvent:(TCountryId const &)countryId
|
||||
{
|
||||
if (countryId != kInvalidCountryId && platform::migrate::NeedMigrate())
|
||||
[self performSegueWithIdentifier:kMigrationSegue sender:self];
|
||||
else
|
||||
[self.downloadDialog processViewportCountryEvent:countryId];
|
||||
}
|
||||
|
||||
#pragma mark - MWMFrameworkUserMarkObserver
|
||||
|
||||
- (void)processUserMarkEvent:(UserMark const *)mark
|
||||
|
|
|
@ -4,4 +4,6 @@
|
|||
|
||||
+ (instancetype)dialogForController:(MWMViewController *)controller;
|
||||
|
||||
- (void)processViewportCountryEvent:(TCountryId const &)countryId;
|
||||
|
||||
@end
|
||||
|
|
|
@ -15,7 +15,7 @@ extern char const * kAutoDownloadEnabledKey;
|
|||
|
||||
using namespace storage;
|
||||
|
||||
@interface MWMMapDownloadDialog ()<MWMFrameworkDrapeObserver, MWMFrameworkStorageObserver,
|
||||
@interface MWMMapDownloadDialog ()<MWMFrameworkStorageObserver,
|
||||
MWMCircularProgressProtocol>
|
||||
@property (weak, nonatomic) IBOutlet UILabel * parentNode;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * node;
|
||||
|
@ -160,8 +160,6 @@ using namespace storage;
|
|||
self.progressView.state = MWMCircularProgressStateSpinner;
|
||||
}
|
||||
|
||||
#pragma mark - MWMFrameworkDrapeObserver
|
||||
|
||||
- (void)processViewportCountryEvent:(TCountryId const &)countryId
|
||||
{
|
||||
if (m_countryId == countryId)
|
||||
|
|
Loading…
Add table
Reference in a new issue