diff options
| author | David Chiles <david@davidchiles.org> | 2017-03-07 14:14:56 -0800 |
|---|---|---|
| committer | Jesse Bounds <jesse@rebounds.net> | 2017-04-11 07:33:22 -0700 |
| commit | 10c6f1fe4f530af5c2032ebfce19c4fe29d39642 (patch) | |
| tree | 846d6cb7874bdd40ad74888cacda1be714125398 /platform/ios/app/MBXViewController.m | |
| parent | c4fc89977bcba83ed5de87dcc8de1a68e8a31541 (diff) | |
| download | qtlocation-mapboxgl-10c6f1fe4f530af5c2032ebfce19c4fe29d39642.tar.gz | |
[ios] Match gesture recognizer with map view user interaction state
Diffstat (limited to 'platform/ios/app/MBXViewController.m')
| -rw-r--r-- | platform/ios/app/MBXViewController.m | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index 39458c4f31..c249949c09 100644 --- a/platform/ios/app/MBXViewController.m +++ b/platform/ios/app/MBXViewController.m @@ -5,6 +5,7 @@ #import "MBXOfflinePacksTableViewController.h" #import "MBXAnnotationView.h" #import "MBXUserLocationAnnotationView.h" +#import "MBXEmbeddedMapViewController.h" #import <Mapbox/Mapbox.h> @@ -79,6 +80,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { MBXSettingsMiscellaneousWorldTour, MBXSettingsMiscellaneousCustomUserDot, MBXSettingsMiscellaneousShowZoomLevel, + MBXSettingsMiscellaneousScrollView, MBXSettingsMiscellaneousPrintLogFile, MBXSettingsMiscellaneousDeleteLogFile, }; @@ -350,6 +352,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { @"Start World Tour", [NSString stringWithFormat:@"%@ Custom User Dot", (_customUserLocationAnnnotationEnabled ? @"Disable" : @"Enable")], [NSString stringWithFormat:@"%@ Zoom Level", (_showZoomLevelEnabled ? @"Hide" :@"Show")], + @"Embedded Map View", ]]; if (self.debugLoggingEnabled) @@ -615,6 +618,13 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { self.reuseQueueStatsEnabled = NO; break; } + case MBXSettingsMiscellaneousScrollView: + { + UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil]; + MBXEmbeddedMapViewController *embeddedMapViewController = (MBXEmbeddedMapViewController *)[storyboard instantiateViewControllerWithIdentifier:@"MBXEmbeddedMapViewController"]; + [self.navigationController pushViewController:embeddedMapViewController animated:YES]; + break; + } default: NSAssert(NO, @"All miscellaneous setting rows should be implemented"); break; |