[ios] Refactor iosappupstream/iosapp-refactor

Add X amount of annotations/symbols

Remove "Add test shapes"

Remove "Add point with a custom callout"

Remove "Query annotations"

Remove "Enable custom user dot"

Remove building extrusions

Remove style road layer

Remove raster layer

Remove add shapes

Remove symbol color

Remove building fill

Remove style ferry layer

Remove style parks

Remove filtered things

Remove query and style features

Remove Style Feature

Remove style point collection

Remove update shape source data/url/features

Remove style water / vector source / image source

Remove style route line

Mark to-be examples

Remove limit camera changes

Remove snapshots

Surgery cleanup

Remove MBXCustomLocationViewController

Remove MBXSnapshotsViewController

Put token in seprate file instead of alert controller

make things work

Fix token issue

Tokens? Tokens.

Bash

Add deleted file back

Move amsterdam file

Hamsterdam

Take out gh stuff

1 files changed, 69 insertions, 1118 deletions

diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index 8d936d6a25..a2d0d107be 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -1,10 +1,8 @@
 #import "MBXViewController.h"
 
 #import "MBXAppDelegate.h"
-#import "MBXCustomCalloutView.h"
 #import "MBXOfflinePacksTableViewController.h"
 #import "MBXAnnotationView.h"
-#import "MBXUserLocationAnnotationView.h"
 #import "LimeGreenStyleLayer.h"
 #import "MBXEmbeddedMapViewController.h"
 #import "MBXOrnamentsViewController.h"
@@ -16,19 +14,6 @@
 
 #import <objc/runtime.h>
 
-static const CLLocationCoordinate2D WorldTourDestinations[] = {
-    { .latitude = 38.8999418, .longitude = -77.033996 },
-    { .latitude = 37.7884307, .longitude = -122.3998631 },
-    { .latitude = 52.5003103, .longitude = 13.4197763 },
-    { .latitude = 60.1712627, .longitude = 24.9378866 },
-    { .latitude = 53.8948782, .longitude = 27.5558476 },
-};
-
-static const MGLCoordinateBounds colorado = {
-    .sw = { .latitude = 36.986207, .longitude = -109.049896},
-    .ne = { .latitude = 40.989329, .longitude = -102.062592},
-};
-
 static NSString * const MBXViewControllerAnnotationViewReuseIdentifer = @"MBXViewControllerAnnotationViewReuseIdentifer";
 
 typedef NS_ENUM(NSInteger, MBXSettingsSections) {
@@ -51,17 +36,9 @@ typedef NS_ENUM(NSInteger, MBXSettingsDebugToolsRows) {
 };
 
 typedef NS_ENUM(NSInteger, MBXSettingsAnnotationsRows) {
-    MBXSettingsAnnotations100Views = 0,
-    MBXSettingsAnnotations1000Views,
-    MBXSettingsAnnotations10000Views,
-    MBXSettingsAnnotations100Sprites,
-    MBXSettingsAnnotations1000Sprites,
-    MBXSettingsAnnotations10000Sprites,
-    MBXSettingsAnnotationAnimation,
-    MBXSettingsAnnotationsTestShapes,
-    MBXSettingsAnnotationsCustomCallout,
-    MBXSettingsAnnotationsQueryAnnotations,
-    MBXSettingsAnnotationsCustomUserDot,
+    MBXSettingsAddAnnotations = 0,
+    MBXSettingsAddSymbols,
+    MBXSettingsAnnotationAnimation, // TODO: Move to ios-sdk-examples
     MBXSettingsAnnotationsRemoveAnnotations,
     MBXSettingsAnnotationSelectRandomOffscreenPointAnnotation,
     MBXSettingsAnnotationCenterSelectedAnnotation,
@@ -69,40 +46,16 @@ typedef NS_ENUM(NSInteger, MBXSettingsAnnotationsRows) {
 };
 
 typedef NS_ENUM(NSInteger, MBXSettingsRuntimeStylingRows) {
-    MBXSettingsRuntimeStylingBuildingExtrusions = 0,
-    MBXSettingsRuntimeStylingWater,
-    MBXSettingsRuntimeStylingRoads,
-    MBXSettingsRuntimeStylingRaster,
-    MBXSettingsRuntimeStylingShape,
-    MBXSettingsRuntimeStylingSymbols,
-    MBXSettingsRuntimeStylingBuildings,
-    MBXSettingsRuntimeStylingFerry,
-    MBXSettingsRuntimeStylingParks,
-    MBXSettingsRuntimeStylingFilteredFill,
-    MBXSettingsRuntimeStylingFilteredLines,
-    MBXSettingsRuntimeStylingNumericFilteredFill,
-    MBXSettingsRuntimeStylingStyleQuery,
-    MBXSettingsRuntimeStylingFeatureSource,
-    MBXSettingsRuntimeStylingPointCollection,
-    MBXSettingsRuntimeStylingUpdateShapeSourceData,
-    MBXSettingsRuntimeStylingUpdateShapeSourceURL,
-    MBXSettingsRuntimeStylingUpdateShapeSourceFeatures,
-    MBXSettingsRuntimeStylingVectorTileSource,
-    MBXSettingsRuntimeStylingRasterTileSource,
-    MBXSettingsRuntimeStylingImageSource,
-    MBXSettingsRuntimeStylingRouteLine,
     MBXSettingsRuntimeStylingAddLimeGreenTriangleLayer,
     MBXSettingsRuntimeStylingDDSPolygon,
-    MBXSettingsRuntimeStylingCustomLatLonGrid,
+    MBXSettingsRuntimeStylingCustomLatLonGrid, // TODO: Move to ios-sdk-examples
 };
 
 typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
-    MBXSettingsMiscellaneousWorldTour,
     MBXSettingsMiscellaneousRandomTour,
     MBXSettingsMiscellaneousScrollView,
     MBXSettingsMiscellaneousToggleTwoMaps,
     MBXSettingsMiscellaneousLocalizeLabels,
-    MBXSettingsMiscellaneousShowSnapshots,
     MBXSettingsMiscellaneousMissingIcon,
     MBXSettingsMiscellaneousShouldLimitCameraChanges,
     MBXSettingsMiscellaneousShowCustomLocationManager,
@@ -111,6 +64,11 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) {
     MBXSettingsMiscellaneousDeleteLogFile
 };
 
+typedef NS_ENUM(NSInteger, MBXSettingsMarkerTypes) {
+    MBXSettingsMarkerTypeAnnotation = 0,
+    MBXSettingsMarkerTypeSymbol
+};
+
 // Utility methods
 CLLocationCoordinate2D coordinateCentered(CLLocationCoordinate2D origin, CLLocationDegrees bearing, CLLocationDistance distance) {
 
@@ -166,24 +124,12 @@ CLLocationCoordinate2D randomWorldCoordinate() {
     return newLocation;
 }
 
-
-
-
-
 @interface MBXDroppedPinAnnotation : MGLPointAnnotation
 @end
 
 @implementation MBXDroppedPinAnnotation
 @end
 
-@interface MBXCustomCalloutAnnotation : MGLPointAnnotation
-@property (nonatomic, assign) BOOL anchoredToAnnotation;
-@property (nonatomic, assign) BOOL dismissesAutomatically;
-@end
-
-@implementation MBXCustomCalloutAnnotation
-@end
-
 @interface MBXSpriteBackedAnnotation : MGLPointAnnotation
 @end
 
@@ -206,7 +152,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
 @property (nonatomic) BOOL reuseQueueStatsEnabled;
 @property (nonatomic) BOOL mapInfoHUDEnabled;
 @property (nonatomic) BOOL frameTimeGraphEnabled;
-@property (nonatomic) BOOL shouldLimitCameraChanges;
 @property (nonatomic) BOOL randomWalk;
 @property (nonatomic) NSMutableArray<UIWindow *> *helperWindows;
 
@@ -251,39 +196,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
     self.mapView.experimental_enableFrameRateMeasurement = YES;
     self.hudLabel.titleLabel.font = [UIFont monospacedDigitSystemFontOfSize:10 weight:UIFontWeightRegular];
 
-    if ([MGLAccountManager accessToken].length)
-    {
-        self.styleIndex = -1;
-        [self cycleStyles:self];
-    }
-    else
-    {
-        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Access Token" message:@"Enter your Mapbox access token to load Mapbox-hosted tiles and styles:" preferredStyle:UIAlertControllerStyleAlert];
-        [alertController addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField)
-         {
-             textField.keyboardType = UIKeyboardTypeURL;
-             textField.autocorrectionType = UITextAutocorrectionTypeNo;
-             textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
-         }];
-
-        [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
-        UIAlertAction *OKAction = [UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action)
-        {
-            UITextField *textField = alertController.textFields.firstObject;
-            NSString *accessToken = textField.text;
-            [[NSUserDefaults standardUserDefaults] setObject:accessToken forKey:MBXMapboxAccessTokenDefaultsKey];
-            [MGLAccountManager setAccessToken:accessToken];
-
-            self.styleIndex = -1;
-            [self cycleStyles:self];
-            [self.mapView reloadStyle:self];
-        }];
-        [alertController addAction:OKAction];
-        alertController.preferredAction = OKAction;
-
-        [self presentViewController:alertController animated:YES completion:nil];
-    }
-
     // Add fall-through single tap gesture recognizer. This will be called when
     // the map view's tap recognizers fail.
     UITapGestureRecognizer *singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleTap:)];
@@ -446,17 +358,9 @@ CLLocationCoordinate2D randomWorldCoordinate() {
             break;
         case MBXSettingsAnnotations:
             [settingsTitles addObjectsFromArray:@[
-                @"Add 100 Views",
-                @"Add 1,000 Views",
-                @"Add 10,000 Views",
-                @"Add 100 Sprites",
-                @"Add 1,000 Sprites",
-                @"Add 10,000 Sprites",
-                @"Animate an Annotation View",
-                @"Add Test Shapes",
-                @"Add Point With Custom Callout",
-                @"Query Annotations",
-                [NSString stringWithFormat:@"%@ Custom User Dot", (_customUserLocationAnnnotationEnabled ? @"Disable" : @"Enable")],
+                @"Add view annotations",
+                @"Add symbols",
+                @"Animate an Annotation View", // TODO: Move to ios-sdk-examples
                 @"Remove Annotations",
                 @"Select an offscreen point annotation",
                 @"Center selected annotation",
@@ -465,28 +369,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
             break;
         case MBXSettingsRuntimeStyling:
             [settingsTitles addObjectsFromArray:@[
-                @"Add Building Extrusions",
-                @"Style Water With Function",
-                @"Style Roads With Function",
-                @"Add Raster & Apply Function",
-                @"Add Shapes & Apply Fill",
-                @"Style Symbol Color",
-                @"Style Building Fill Color",
-                @"Style Ferry Line Color",
-                @"Remove Parks",
-                @"Style Fill With Filter",
-                @"Style Lines With Filter",
-                @"Style Fill With Numeric Filter",
-                @"Query and Style Features",
-                @"Style Feature",
-                @"Style Dynamic Point Collection",
-                @"Update Shape Source: Data",
-                @"Update Shape Source: URL",
-                @"Update Shape Source: Features",
-                @"Style Vector Tile Source",
-                @"Style Raster Tile Source",
-                @"Style Image Source",
-                @"Add Route Line",
                 @"Add Lime Green Triangle Layer",
                 @"Dynamically Style Polygon",
                 @"Add Custom Lat/Lon Grid",
@@ -494,15 +376,10 @@ CLLocationCoordinate2D randomWorldCoordinate() {
             break;
         case MBXSettingsMiscellaneous:
             [settingsTitles addObjectsFromArray:@[
-                @"Start World Tour",
                 @"Random Tour",
                 @"Embedded Map View",
                 [NSString stringWithFormat:@"%@ Second Map", ([self.view viewWithTag:2] == nil ? @"Show" : @"Hide")],
                 [NSString stringWithFormat:@"Show Labels in %@", (_localizingLabels ? @"Default Language" : [[NSLocale currentLocale] displayNameForKey:NSLocaleIdentifier value:[self bestLanguageForUser]])],
-                @"Show Snapshots",
-                @"Missing Icon",
-                [NSString stringWithFormat:@"%@ Camera Changes", (_shouldLimitCameraChanges ? @"Unlimit" : @"Limit")],
-                @"View Route Simulation",
                 @"Ornaments Placement",
             ]];
 
@@ -578,39 +455,15 @@ CLLocationCoordinate2D randomWorldCoordinate() {
         case MBXSettingsAnnotations:
             switch (indexPath.row)
             {
-                case MBXSettingsAnnotations100Views:
-                    [self parseFeaturesAddingCount:100 usingViews:YES];
+                case MBXSettingsAddAnnotations:
+                    [self addMarkersWithType:MBXSettingsMarkerTypeAnnotation];
                     break;
-                case MBXSettingsAnnotations1000Views:
-                    [self parseFeaturesAddingCount:1000 usingViews:YES];
+                case MBXSettingsAddSymbols:
+                    [self addMarkersWithType:MBXSettingsMarkerTypeSymbol];
                     break;
-                case MBXSettingsAnnotations10000Views:
-                    [self parseFeaturesAddingCount:10000 usingViews:YES];
-                    break;
-                case MBXSettingsAnnotations100Sprites:
-                    [self parseFeaturesAddingCount:100 usingViews:NO];
-                    break;
-                case MBXSettingsAnnotations1000Sprites:
-                    [self parseFeaturesAddingCount:1000 usingViews:NO];
-                    break;
-                case MBXSettingsAnnotations10000Sprites:
-                    [self parseFeaturesAddingCount:10000 usingViews:NO];
-                    break;
-                case MBXSettingsAnnotationAnimation:
+                case MBXSettingsAnnotationAnimation: // TODO: Move to ios-sdk-examples
                     [self animateAnnotationView];
                     break;
-                case MBXSettingsAnnotationsTestShapes:
-                    [self addTestShapes];
-                    break;
-                case MBXSettingsAnnotationsCustomCallout:
-                    [self addAnnotationWithCustomCallout];
-                    break;
-                case MBXSettingsAnnotationsQueryAnnotations:
-                    [self testQueryPointAnnotations];
-                    break;
-                case MBXSettingsAnnotationsCustomUserDot:
-                    [self toggleCustomUserDot];
-                    break;
                 case MBXSettingsAnnotationsRemoveAnnotations:
                     [self.mapView removeAnnotations:self.mapView.annotations];
                     break;
@@ -634,78 +487,9 @@ CLLocationCoordinate2D randomWorldCoordinate() {
         case MBXSettingsRuntimeStyling:
             switch (indexPath.row)
             {
-                case MBXSettingsRuntimeStylingBuildingExtrusions:
-                    [self styleBuildingExtrusions];
-                    break;
-                case MBXSettingsRuntimeStylingWater:
-                    [self styleWaterLayer];
-                    break;
-                case MBXSettingsRuntimeStylingRoads:
-                    [self styleRoadLayer];
-                    break;
-                case MBXSettingsRuntimeStylingRaster:
-                    [self styleRasterLayer];
-                    break;
-                case MBXSettingsRuntimeStylingShape:
-                    [self styleShapeSource];
-                    break;
-                case MBXSettingsRuntimeStylingSymbols:
-                    [self styleSymbolLayer];
-                    break;
-                case MBXSettingsRuntimeStylingBuildings:
-                    [self styleBuildingLayer];
-                    break;
-                case MBXSettingsRuntimeStylingFerry:
-                    [self styleFerryLayer];
-                    break;
-                case MBXSettingsRuntimeStylingParks:
-                    [self removeParkLayer];
-                    break;
-                case MBXSettingsRuntimeStylingFilteredFill:
-                    [self styleFilteredFill];
-                    break;
-                case MBXSettingsRuntimeStylingFilteredLines:
-                    [self styleFilteredLines];
-                    break;
-                case MBXSettingsRuntimeStylingNumericFilteredFill:
-                    [self styleNumericFilteredFills];
-                    break;
-                case MBXSettingsRuntimeStylingStyleQuery:
-                    [self styleQuery];
-                    break;
-                case MBXSettingsRuntimeStylingFeatureSource:
-                    [self styleFeature];
-                    break;
-                case MBXSettingsRuntimeStylingPointCollection:
-                    [self styleDynamicPointCollection];
-                    break;
-                case MBXSettingsRuntimeStylingUpdateShapeSourceURL:
-                    [self updateShapeSourceURL];
-                    break;
-                case MBXSettingsRuntimeStylingUpdateShapeSourceData:
-                    [self updateShapeSourceData];
-                    break;
-                case MBXSettingsRuntimeStylingUpdateShapeSourceFeatures:
-                    [self updateShapeSourceFeatures];
-                    break;
-                case MBXSettingsRuntimeStylingVectorTileSource:
-                    [self styleVectorTileSource];
-                    break;
-                case MBXSettingsRuntimeStylingRasterTileSource:
-                    [self styleRasterTileSource];
-                    break;
-                case MBXSettingsRuntimeStylingImageSource:
-                    [self styleImageSource];
-                    break;
-                case MBXSettingsRuntimeStylingRouteLine:
-                    [self styleRouteLine];
-                    break;
                 case MBXSettingsRuntimeStylingAddLimeGreenTriangleLayer:
                     [self styleAddLimeGreenTriangleLayer];
                     break;
-                case MBXSettingsRuntimeStylingDDSPolygon:
-                    [self stylePolygonWithDDS];
-                    break;
                 case MBXSettingsRuntimeStylingCustomLatLonGrid:
                     [self addLatLonGrid];
                     break;
@@ -717,16 +501,12 @@ CLLocationCoordinate2D randomWorldCoordinate() {
         case MBXSettingsMiscellaneous:
             switch (indexPath.row)
             {
-                case MBXSettingsMiscellaneousLocalizeLabels:
+                case MBXSettingsMiscellaneousLocalizeLabels: // TODO: Move to ios-sdk-examples
                     [self toggleStyleLabelsLanguage];
                     break;
-                case MBXSettingsMiscellaneousWorldTour:
-                    [self startWorldTour];
-                    break;
                 case MBXSettingsMiscellaneousRandomTour:
                     [self randomWorldTour];
                     break;
-
                 case MBXSettingsMiscellaneousPrintLogFile:
                     [self printTelemetryLogFile];
                     break;
@@ -743,11 +523,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
                 case MBXSettingsMiscellaneousToggleTwoMaps:
                     [self toggleSecondMapView];
                     break;
-                case MBXSettingsMiscellaneousShowSnapshots:
-                {
-                    [self performSegueWithIdentifier:@"ShowSnapshots" sender:nil];
-                    break;
-                }
                 case MBXSettingsMiscellaneousMissingIcon:
                 {
                     [self loadMissingIcon];
@@ -758,14 +533,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
                     [self performSegueWithIdentifier:@"ShowCustomLocationManger" sender:nil];
                     break;
                 }
-                case MBXSettingsMiscellaneousShouldLimitCameraChanges:
-                {
-                    self.shouldLimitCameraChanges = !self.shouldLimitCameraChanges;
-                    if (self.shouldLimitCameraChanges) {
-                        [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(39.748947, -104.995882) zoomLevel:10 direction:0 animated:NO];
-                    }
-                    break;
-                }
                 case MBXSettingsMiscellaneousOrnamentsPlacement:
                 {
                     MBXOrnamentsViewController *ornamentsViewController = [[MBXOrnamentsViewController alloc] init];
@@ -819,45 +586,63 @@ CLLocationCoordinate2D randomWorldCoordinate() {
 
 #pragma mark - Debugging Actions
 
-- (void)parseFeaturesAddingCount:(NSUInteger)featuresCount usingViews:(BOOL)useViews
+- (void)addMarkersWithType:(NSInteger)markerType
 {
-    [self.mapView removeAnnotations:self.mapView.annotations];
+    NSString *markerTitle = (markerType == MBXSettingsMarkerTypeAnnotation ? @"annotations" : @"symbols");
 
-    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^
-    {
-        NSData *featuresData = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"points" ofType:@"geojson"]];
+    UIAlertController *addMarkerAlert = [UIAlertController alertControllerWithTitle:[NSString stringWithFormat:@"Add %@", markerTitle]
+                                                                            message:@"Enter a number"
+                                                                     preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertAction *saveMarkerAction = [UIAlertAction actionWithTitle:@"Save" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
 
-        id features = [NSJSONSerialization JSONObjectWithData:featuresData
-                                                      options:0
-                                                        error:nil];
+        NSUInteger markerCount = addMarkerAlert.textFields[0].text.integerValue;
 
-        if ([features isKindOfClass:[NSDictionary class]])
-        {
-            NSMutableArray *annotations = [NSMutableArray array];
+        [self.mapView removeAnnotations:self.mapView.annotations];
 
-            for (NSDictionary *feature in features[@"features"])
-            {
-                CLLocationCoordinate2D coordinate = CLLocationCoordinate2DMake([feature[@"geometry"][@"coordinates"][1] doubleValue],
-                                                                               [feature[@"geometry"][@"coordinates"][0] doubleValue]);
-                NSString *title = feature[@"properties"][@"NAME"];
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^
+                       {
+                           NSData *featuresData = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"points" ofType:@"geojson"]];
 
-                MGLPointAnnotation *annotation = (useViews ? [MGLPointAnnotation new] : [MBXSpriteBackedAnnotation new]);
+                           id features = [NSJSONSerialization JSONObjectWithData:featuresData
+                                                                         options:0
+                                                                           error:nil];
 
-                annotation.coordinate = coordinate;
-                annotation.title = title;
+                           if ([features isKindOfClass:[NSDictionary class]])
+                           {
+                               NSMutableArray *annotations = [NSMutableArray array];
 
-                [annotations addObject:annotation];
+                               for (NSDictionary *feature in features[@"features"])
+                               {
+                                   CLLocationCoordinate2D coordinate = CLLocationCoordinate2DMake([feature[@"geometry"][@"coordinates"][1] doubleValue],
+                                                                                                  [feature[@"geometry"][@"coordinates"][0] doubleValue]);
+                                   NSString *title = feature[@"properties"][@"NAME"];
 
-                if (annotations.count == featuresCount) break;
-            }
+                                   MGLPointAnnotation *annotation = (markerType == MBXSettingsMarkerTypeAnnotation ? [MGLPointAnnotation new] : [MBXSpriteBackedAnnotation new]);
+
+                                   annotation.coordinate = coordinate;
+                                   annotation.title = title;
+
+                                   [annotations addObject:annotation];
+
+                                   if (annotations.count == markerCount) break;
+                               }
+
+                               dispatch_async(dispatch_get_main_queue(), ^
+                                              {
+                                                  [self.mapView addAnnotations:annotations];
+                                                  [self.mapView showAnnotations:annotations animated:YES];
+                                              });
+                           }
+                       });
+    }];
+
+    [addMarkerAlert addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) {
+        textField.keyboardType = UIKeyboardTypeNumberPad;
+    }];
+
+    [addMarkerAlert addAction:saveMarkerAction];
+    [self presentViewController:addMarkerAlert animated:YES completion:nil];
 
-            dispatch_async(dispatch_get_main_queue(), ^
-            {
-                [self.mapView addAnnotations:annotations];
-                [self.mapView showAnnotations:annotations animated:YES];
-            });
-        }
-    });
 }
 
 - (void)animateAnnotationView
@@ -877,693 +662,19 @@ CLLocationCoordinate2D randomWorldCoordinate() {
         });
     };
 
-- (void)addTestShapes
-{
-    // Pacific Northwest triangle
-    //
-    CLLocationCoordinate2D triangleCoordinates[3] =
-    {
-        CLLocationCoordinate2DMake(44, -122),
-        CLLocationCoordinate2DMake(46, -122),
-        CLLocationCoordinate2DMake(46, -121)
-    };
-
-    MGLPolygon *triangle = [MGLPolygon polygonWithCoordinates:triangleCoordinates count:3];
-
-    [self.mapView addAnnotation:triangle];
-
-    // West coast polyline
-    //
-    CLLocationCoordinate2D lineCoordinates[4] = {
-        CLLocationCoordinate2DMake(47.6025, -122.3327),
-        CLLocationCoordinate2DMake(45.5189, -122.6726),
-        CLLocationCoordinate2DMake(37.7790, -122.4177),
-        CLLocationCoordinate2DMake(34.0532, -118.2349)
-    };
-    MGLPolyline *line = [MGLPolyline polylineWithCoordinates:lineCoordinates count:4];
-    [self.mapView addAnnotation:line];
-
-    // Orcas Island, WA hike polyline
-    //
-    NSDictionary *hike = [NSJSONSerialization JSONObjectWithData:
-                             [NSData dataWithContentsOfFile:
-                                 [[NSBundle mainBundle] pathForResource:@"polyline" ofType:@"geojson"]]
-                                                         options:0
-                                                           error:nil];
-
-    NSArray *hikeCoordinatePairs = hike[@"features"][0][@"geometry"][@"coordinates"];
-
-    CLLocationCoordinate2D *polylineCoordinates = (CLLocationCoordinate2D *)malloc([hikeCoordinatePairs count] * sizeof(CLLocationCoordinate2D));
-
-    for (NSUInteger i = 0; i < [hikeCoordinatePairs count]; i++)
-    {
-        polylineCoordinates[i] = CLLocationCoordinate2DMake([hikeCoordinatePairs[i][1] doubleValue], [hikeCoordinatePairs[i][0] doubleValue]);
-    }
-
-    MGLPolyline *polyline = [MGLPolyline polylineWithCoordinates:polylineCoordinates
-                                                           count:[hikeCoordinatePairs count]];
-
-    [self.mapView addAnnotation:polyline];
-
-    free(polylineCoordinates);
-
-    // PA/NJ/DE polygons
-    //
-    NSDictionary *threestates = [NSJSONSerialization JSONObjectWithData:
-                          [NSData dataWithContentsOfFile:
-                           [[NSBundle mainBundle] pathForResource:@"threestates" ofType:@"geojson"]]
-                                                         options:0
-                                                           error:nil];
-
-    for (NSDictionary *feature in threestates[@"features"])
-    {
-        NSArray *stateCoordinatePairs = feature[@"geometry"][@"coordinates"];
-
-        while ([stateCoordinatePairs count] == 1) stateCoordinatePairs = stateCoordinatePairs[0];
-
-        CLLocationCoordinate2D *polygonCoordinates = (CLLocationCoordinate2D *)malloc([stateCoordinatePairs count] * sizeof(CLLocationCoordinate2D));
-
-        for (NSUInteger i = 0; i < [stateCoordinatePairs count]; i++)
-        {
-            polygonCoordinates[i] = CLLocationCoordinate2DMake([stateCoordinatePairs[i][1] doubleValue], [stateCoordinatePairs[i][0] doubleValue]);
-        }
-
-        MGLPolygon *polygon = [MGLPolygon polygonWithCoordinates:polygonCoordinates count:[stateCoordinatePairs count]];
-        polygon.title = feature[@"properties"][@"NAME"];
-
-        [self.mapView addAnnotation:polygon];
-
-        free(polygonCoordinates);
-    }
-
-    // Null Island polygon with an interior hole
-    //
-    CLLocationCoordinate2D innerCoordinates[] = {
-        CLLocationCoordinate2DMake(-5, -5),
-        CLLocationCoordinate2DMake(-5, 5),
-        CLLocationCoordinate2DMake(5, 5),
-        CLLocationCoordinate2DMake(5, -5),
-    };
-    MGLPolygon *innerPolygon = [MGLPolygon polygonWithCoordinates:innerCoordinates count:sizeof(innerCoordinates) / sizeof(innerCoordinates[0])];
-    CLLocationCoordinate2D outerCoordinates[] = {
-        CLLocationCoordinate2DMake(-10, -10),
-        CLLocationCoordinate2DMake(-10, 10),
-        CLLocationCoordinate2DMake(10, 10),
-        CLLocationCoordinate2DMake(10, -10),
-    };
-    MGLPolygon *outerPolygon = [MGLPolygon polygonWithCoordinates:outerCoordinates count:sizeof(outerCoordinates) / sizeof(outerCoordinates[0]) interiorPolygons:@[innerPolygon]];
-    [self.mapView addAnnotation:outerPolygon];
-}
-
-- (void)addAnnotationWithCustomCallout
-{
-    [self.mapView removeAnnotations:self.mapView.annotations];
-
-    MBXCustomCalloutAnnotation *firstAnnotation = [[MBXCustomCalloutAnnotation alloc] init];
-    firstAnnotation.coordinate = CLLocationCoordinate2DMake(48.8533940, 2.3775439);
-    firstAnnotation.title = @"Open anchored to annotation";
-    firstAnnotation.anchoredToAnnotation = YES;
-    firstAnnotation.dismissesAutomatically = NO;
-
-    MBXCustomCalloutAnnotation *secondAnnotation = [[MBXCustomCalloutAnnotation alloc] init];
-    secondAnnotation.coordinate = CLLocationCoordinate2DMake(48.8543940, 2.3775439);
-    secondAnnotation.title = @"Open not anchored to annotation";
-    secondAnnotation.anchoredToAnnotation = NO;
-    secondAnnotation.dismissesAutomatically = NO;
-
-    MBXCustomCalloutAnnotation *thirdAnnotation = [[MBXCustomCalloutAnnotation alloc] init];
-    thirdAnnotation.coordinate = CLLocationCoordinate2DMake(48.8553940, 2.3775439);
-    thirdAnnotation.title = @"Dismisses automatically";
-    thirdAnnotation.anchoredToAnnotation = YES;
-    thirdAnnotation.dismissesAutomatically = YES;
-
-    NSArray *annotations = @[firstAnnotation, secondAnnotation, thirdAnnotation];
-    [self.mapView addAnnotations:annotations];
-
-    [self.mapView showAnnotations:annotations animated:YES];
-}
-
-- (void)styleBuildingExtrusions
-{
-    MGLSource* source = [self.mapView.style sourceWithIdentifier:@"composite"];
-    if (source) {
-
-        MGLFillExtrusionStyleLayer* layer = [[MGLFillExtrusionStyleLayer alloc] initWithIdentifier:@"extrudedBuildings" source:source];
-        layer.sourceLayerIdentifier = @"building";
-        layer.predicate = [NSPredicate predicateWithFormat:@"extrude == 'true' AND CAST(height, 'NSNumber') > 0"];
-        layer.fillExtrusionBase = [NSExpression expressionForKeyPath:@"min_height"];
-        layer.fillExtrusionHeight = [NSExpression expressionForKeyPath:@"height"];
-
-        // Set the fill color to that of the existing building footprint layer, if it exists.
-        MGLFillStyleLayer* buildingLayer = (MGLFillStyleLayer*)[self.mapView.style layerWithIdentifier:@"building"];
-        if (buildingLayer) {
-            if (buildingLayer.fillColor) {
-                layer.fillExtrusionColor = buildingLayer.fillColor;
-            } else {
-                layer.fillExtrusionColor = [NSExpression expressionForConstantValue:[UIColor whiteColor]];
-            }
-
-            layer.fillExtrusionOpacity = [NSExpression expressionForConstantValue:@0.75];
-        }
-
-        MGLStyleLayer* labelLayer = [self.mapView.style layerWithIdentifier:@"waterway-label"];
-        if (labelLayer) {
-            [self.mapView.style insertLayer:layer belowLayer:labelLayer];
-        } else {
-            [self.mapView.style addLayer:layer];
-        }
-    }
-}
-
-- (void)styleWaterLayer
-{
-    MGLFillStyleLayer *waterLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"water"];
-    NSDictionary *waterColorStops = @{@6.0f: [UIColor yellowColor],
-                                      @8.0f: [UIColor blueColor],
-                                      @10.0f: [UIColor redColor],
-                                      @12.0f: [UIColor greenColor],
-                                      @14.0f: [UIColor blueColor]};
-    NSExpression *fillColorExpression = [NSExpression mgl_expressionForInterpolatingExpression:NSExpression.zoomLevelVariableExpression
-                                                                                 withCurveType:MGLExpressionInterpolationModeLinear
-                                                                                    parameters:nil
-                                                                                         stops:[NSExpression expressionForConstantValue:waterColorStops]];
-    waterLayer.fillColor = fillColorExpression;
-
-    NSDictionary *fillAntialiasedStops = @{@11: @YES,
-                                           @12: @NO,
-                                           @13: @YES,
-                                           @14: @NO,
-                                           @15: @YES};
-    waterLayer.fillAntialiased = [NSExpression mgl_expressionForSteppingExpression:NSExpression.zoomLevelVariableExpression
-                                                                    fromExpression:[NSExpression expressionForConstantValue:@NO]
-                                                                             stops:[NSExpression expressionForConstantValue:fillAntialiasedStops]];
-}
-
-- (void)styleRoadLayer
-{
-    MGLLineStyleLayer *roadLayer = (MGLLineStyleLayer *)[self.mapView.style layerWithIdentifier:@"road-primary"];
-    roadLayer.lineColor = [NSExpression expressionForConstantValue:[UIColor blackColor]];
-
-    NSDictionary *lineWidthStops = @{@5: @5,
-                                     @10: @15,
-                                     @15: @30};
-    NSExpression *lineWidthExpression = [NSExpression expressionWithFormat:
-                                         @"mgl_interpolate:withCurveType:parameters:stops:($zoomLevel, 'linear', nil, %@)",
-                                         lineWidthStops];
-    roadLayer.lineWidth = lineWidthExpression;
-    roadLayer.lineGapWidth = lineWidthExpression;
-
-    NSDictionary *roadLineColorStops = @{@10: [UIColor purpleColor],
-                                         @13: [UIColor yellowColor],
-                                         @16: [UIColor cyanColor]};
-    roadLayer.lineColor = [NSExpression expressionWithFormat:
-                           @"mgl_interpolate:withCurveType:parameters:stops:($zoomLevel, 'linear', nil, %@)",
-                           roadLineColorStops];
-
-    roadLayer.visible = YES;
-    roadLayer.maximumZoomLevel = 15;
-    roadLayer.minimumZoomLevel = 13;
-}
-
-- (void)styleRasterLayer
-{
-    NSURL *rasterURL = [NSURL URLWithString:@"mapbox://mapbox.satellite"];
-    MGLRasterTileSource *rasterTileSource = [[MGLRasterTileSource alloc] initWithIdentifier:@"my-raster-tile-source" configurationURL:rasterURL tileSize:512];
-    [self.mapView.style addSource:rasterTileSource];
-
-    MGLRasterStyleLayer *rasterLayer = [[MGLRasterStyleLayer alloc] initWithIdentifier:@"my-raster-layer" source:rasterTileSource];
-    NSDictionary *opacityStops = @{@20.0f: @1.0f,
-                                   @5.0f: @0.0f};
-    rasterLayer.rasterOpacity = [NSExpression expressionWithFormat:
-                                 @"mgl_interpolate:withCurveType:parameters:stops:($zoomLevel, 'linear', nil, %@)",
-                                 opacityStops];
-    [self.mapView.style addLayer:rasterLayer];
-}
-
-- (void)styleShapeSource
-{
-    NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"amsterdam" ofType:@"geojson"];
-    NSURL *geoJSONURL = [NSURL fileURLWithPath:filePath];
-    MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"ams" URL:geoJSONURL options:nil];
-    [self.mapView.style addSource:source];
-
-    MGLFillStyleLayer *fillLayer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"test" source:source];
-    fillLayer.fillColor = [NSExpression expressionForConstantValue:[UIColor purpleColor]];
-    [self.mapView.style addLayer:fillLayer];
-
-}
-
-- (void)styleSymbolLayer
-{
-    MGLSymbolStyleLayer *stateLayer = (MGLSymbolStyleLayer *)[self.mapView.style layerWithIdentifier:@"state-label-lg"];
-    stateLayer.textColor = [NSExpression expressionForConstantValue:[UIColor redColor]];
-}
-
-- (void)styleBuildingLayer
-{
-    MGLTransition transition =  { 5,  1 };
-    self.mapView.style.transition = transition;
-    MGLFillStyleLayer *buildingLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"building"];
-    buildingLayer.fillColor = [NSExpression expressionForConstantValue:[UIColor purpleColor]];
-}
-
-- (void)styleFerryLayer
-{
-    MGLLineStyleLayer *ferryLineLayer = (MGLLineStyleLayer *)[self.mapView.style layerWithIdentifier:@"ferry"];
-    ferryLineLayer.lineColor = [NSExpression expressionForConstantValue:[UIColor redColor]];
-}
-
-- (void)removeParkLayer
-{
-    MGLFillStyleLayer *parkLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"park"];
-    [self.mapView.style removeLayer:parkLayer];
-}
-
-- (void)styleFilteredFill
-{
-    // set style and focus on Texas
-    [self.mapView setStyleURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"fill_filter_style" ofType:@"json"]]];
-    [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(31, -100) zoomLevel:3 animated:NO];
-
-    // after slight delay, fill in Texas (atypical use; we want to clearly see the change for test purposes)
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^
-    {
-        MGLFillStyleLayer *statesLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"states"];
-
-        // filter
-        statesLayer.predicate = [NSPredicate predicateWithFormat:@"name == 'Texas'"];
-
-        // paint properties
-        statesLayer.fillColor = [NSExpression expressionForConstantValue:[UIColor redColor]];
-        statesLayer.fillOpacity = [NSExpression expressionForConstantValue:@0.25];
-    });
-}
-
-- (void)styleFilteredLines
-{
-    // set style and focus on lower 48
-    [self.mapView setStyleURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"line_filter_style" ofType:@"json"]]];
-    [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(40, -97) zoomLevel:5 animated:NO];
-
-    // after slight delay, change styling for all Washington-named counties  (atypical use; we want to clearly see the change for test purposes)
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^
-    {
-        MGLLineStyleLayer *countiesLayer = (MGLLineStyleLayer *)[self.mapView.style layerWithIdentifier:@"counties"];
-
-        // filter
-        countiesLayer.predicate = [NSPredicate predicateWithFormat:@"NAME10 == 'Washington'"];
-
-        // paint properties
-        countiesLayer.lineColor = [NSExpression expressionForConstantValue:[UIColor redColor]];
-        countiesLayer.lineOpacity = [NSExpression expressionForConstantValue:@0.75];
-        countiesLayer.lineWidth = [NSExpression expressionForConstantValue:@5];
-    });
-}
-
-- (void)styleNumericFilteredFills
-{
-    // set style and focus on lower 48
-    [self.mapView setStyleURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"numeric_filter_style" ofType:@"json"]]];
-    [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(40, -97) zoomLevel:5 animated:NO];
-
-    // after slight delay, change styling for regions 200-299 (atypical use; we want to clearly see the change for test purposes)
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^
-    {
-        MGLFillStyleLayer *regionsLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"regions"];
-
-        // filter (testing both inline and format strings)
-        regionsLayer.predicate = [NSPredicate predicateWithFormat:@"CAST(HRRNUM, 'NSNumber') >= %@ AND CAST(HRRNUM, 'NSNumber') < 300", @(200)];
-
-        // paint properties
-        regionsLayer.fillColor = [NSExpression expressionForConstantValue:[UIColor blueColor]];
-        regionsLayer.fillOpacity = [NSExpression expressionForConstantValue:@0.5];
-    });
-}
-
-- (void)styleQuery
-{
-    CGRect queryRect = CGRectInset(self.mapView.bounds, 100, 200);
-    NSArray *visibleFeatures = [self.mapView visibleFeaturesInRect:queryRect];
-
-    NSString *querySourceID = @"query-source-id";
-    NSString *queryLayerID = @"query-layer-id";
-
-    // RTE if you don't remove the layer first
-    // RTE if you pass a nill layer to remove layer
-    MGLStyleLayer *layer = [self.mapView.style layerWithIdentifier:queryLayerID];
-    if (layer) {
-        [self.mapView.style removeLayer:layer];
-    }
-
-    // RTE if you pass a nill source to remove source
-    MGLSource *source = [self.mapView.style sourceWithIdentifier:querySourceID];
-    if (source) {
-        [self.mapView.style removeSource:source];
-    }
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-        MGLShapeSource *shapeSource = [[MGLShapeSource alloc] initWithIdentifier:querySourceID features:visibleFeatures options:nil];
-        [self.mapView.style addSource:shapeSource];
-
-        MGLFillStyleLayer *fillLayer = [[MGLFillStyleLayer alloc] initWithIdentifier:queryLayerID source:shapeSource];
-        fillLayer.fillColor = [NSExpression expressionForConstantValue:[UIColor blueColor]];
-        fillLayer.fillOpacity = [NSExpression expressionForConstantValue:@0.5];
-        [self.mapView.style addLayer:fillLayer];
-    });
-}
-
-- (void)styleFeature
-{
-    self.mapView.zoomLevel = 10;
-    self.mapView.centerCoordinate = CLLocationCoordinate2DMake(51.068585180672635, -114.06074523925781);
-
-    CLLocationCoordinate2D leafCoords[] = {
-        {50.9683733218221,-114.07035827636719},
-        {51.02325750523972,-114.06967163085938},
-        {51.009434536947786,-114.14245605468749},
-        {51.030599281184124,-114.12597656249999},
-        {51.060386316691016,-114.21043395996094},
-        {51.063838646941576,-114.17816162109375},
-        {51.08152779888779,-114.19876098632812},
-        {51.08066507029602,-114.16854858398438},
-        {51.09662294502995,-114.17472839355469},
-        {51.07764539352731,-114.114990234375},
-        {51.13670896949613,-114.12391662597656},
-        {51.13369295212583,-114.09576416015624},
-        {51.17546878815025,-114.07585144042969},
-        {51.140155605265896,-114.04632568359375},
-        {51.15049396880196,-114.01542663574219},
-        {51.088860342359965,-114.00924682617186},
-        {51.12205789681453,-113.94813537597656},
-        {51.106539930027225,-113.94882202148438},
-        {51.117747873223344,-113.92616271972656},
-        {51.10093493903458,-113.92616271972656},
-        {51.10697105503078,-113.90625},
-        {51.09144802136697,-113.9117431640625},
-        {51.04916446529361,-113.97010803222655},
-        {51.045279344649146,-113.9398956298828},
-        {51.022825599852496,-114.06211853027344},
-        {51.045279344649146,-113.9398956298828},
-        {51.022825599852496,-114.06211853027344},
-        {51.022825599852496,-114.06280517578125},
-        {50.968805734317804,-114.06280517578125},
-        {50.9683733218221,-114.07035827636719},
-    };
-    NSUInteger coordsCount = sizeof(leafCoords) / sizeof(leafCoords[0]);
-
-    MGLPolygonFeature *feature = [MGLPolygonFeature polygonWithCoordinates:leafCoords count:coordsCount];
-    feature.identifier = @"leaf-feature";
-    feature.attributes = @{@"color": @"red"};
-
-    MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"leaf-source" shape:feature options:nil];
-    [self.mapView.style addSource:source];
-
-    MGLFillStyleLayer *layer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"leaf-fill-layer" source:source];
-    layer.predicate = [NSPredicate predicateWithFormat:@"color = 'red'"];
-    layer.fillColor = [NSExpression expressionForConstantValue:[UIColor redColor]];
-    [self.mapView.style addLayer:layer];
-
-    NSString *geoJSON = @"{\"type\": \"Feature\", \"properties\": {\"color\": \"green\"}, \"geometry\": { \"type\": \"Point\", \"coordinates\": [ -114.06847000122069, 51.050459433092655 ] }}";
-
-    NSData *data = [geoJSON dataUsingEncoding:NSUTF8StringEncoding];
-    MGLShape *shape = [MGLShape shapeWithData:data encoding:NSUTF8StringEncoding error:NULL];
-    MGLShapeSource *pointSource = [[MGLShapeSource alloc] initWithIdentifier:@"leaf-point-source" shape:shape options:nil];
-    [self.mapView.style addSource:pointSource];
-
-    MGLCircleStyleLayer *circleLayer = [[MGLCircleStyleLayer alloc] initWithIdentifier:@"leaf-circle-layer" source:pointSource];
-    circleLayer.circleColor = [NSExpression expressionForConstantValue:[UIColor greenColor]];
-    circleLayer.predicate = [NSPredicate predicateWithFormat:@"color = 'green'"];
-    [self.mapView.style addLayer:circleLayer];
-
-
-    CLLocationCoordinate2D squareCoords[] = {
-        {51.056070541830934, -114.0274429321289},
-        {51.07937094724242, -114.0274429321289},
-        {51.07937094724242, -113.98761749267578},
-        {51.05607054183093, -113.98761749267578},
-        {51.056070541830934, -114.0274429321289},
-    };
-    MGLPolygon *polygon = [MGLPolygon polygonWithCoordinates:squareCoords count:sizeof(squareCoords)/sizeof(squareCoords[0])];
-    MGLShapeSource *plainShapeSource = [[MGLShapeSource alloc] initWithIdentifier:@"leaf-plain-shape-source" shape:polygon options:nil];
-    [self.mapView.style addSource:plainShapeSource];
-
-    MGLFillStyleLayer *plainFillLayer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"leaf-plain-fill-layer" source:plainShapeSource];
-    plainFillLayer.fillColor = [NSExpression expressionForConstantValue:[UIColor yellowColor]];
-    [self.mapView.style addLayer:plainFillLayer];
-}
-
-- (void)updateShapeSourceData
-{
-    [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(40.329795743702064, -107.75390625) zoomLevel:11 animated:NO];
-
-    NSString *geoJSON = @"{\"type\": \"FeatureCollection\",\"features\": [{\"type\": \"Feature\",\"properties\": {},\"geometry\": {\"type\": \"LineString\",\"coordinates\": [[-107.75390625,40.329795743702064],[-104.34814453125,37.64903402157866]]}}]}";
-
-    NSData *data = [geoJSON dataUsingEncoding:NSUTF8StringEncoding];
-    MGLShape *shape = [MGLShape shapeWithData:data encoding:NSUTF8StringEncoding error:NULL];
-    MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"mutable-data-source-id" shape:shape options:nil];
-    [self.mapView.style addSource:source];
-
-    MGLLineStyleLayer *layer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"mutable-data-layer-id" source:source];
-    [self.mapView.style addLayer:layer];
-
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        NSString *updatedGeoJSON = @"{\"type\": \"FeatureCollection\",\"features\": [{\"type\": \"Feature\",\"properties\": {},\"geometry\": {\"type\": \"LineString\",\"coordinates\": [[-107.75390625,40.329795743702064],[-109.34814453125,37.64903402157866]]}}]}";
-        NSData *updatedData = [updatedGeoJSON dataUsingEncoding:NSUTF8StringEncoding];
-        MGLShape *updatedShape = [MGLShape shapeWithData:updatedData encoding:NSUTF8StringEncoding error:NULL];
-        source.shape = updatedShape;
-    });
-}
-
-- (void)updateShapeSourceURL
-{
-    [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(48.668731, -122.857151) zoomLevel:11 animated:NO];
-
-    NSString *filePath = [[NSBundle bundleForClass:self.class] pathForResource:@"polyline" ofType:@"geojson"];
-    NSURL *geoJSONURL = [NSURL fileURLWithPath:filePath];
-    MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"mutable-data-source-url-id" URL:geoJSONURL options:nil];
-    [self.mapView.style addSource:source];
-
-    MGLLineStyleLayer *layer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"mutable-data-layer-url-id" source:source];
-    [self.mapView.style addLayer:layer];
-
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(41.563986787078704, -75.04843935793578) zoomLevel:8 animated:NO];
-
-        NSString *threeStatesFilePath = [[NSBundle bundleForClass:self.class] pathForResource:@"threestates" ofType:@"geojson"];
-        NSURL *updatedGeoJSONURL = [NSURL fileURLWithPath:threeStatesFilePath];
-
-        source.URL = updatedGeoJSONURL;
-    });
-}
-
-- (void)updateShapeSourceFeatures
-{
-    [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(-41.1520, 288.6592) zoomLevel:10 animated:NO];
-
-    CLLocationCoordinate2D smallBox[] = {
-        {-41.14763798539186, 288.68019104003906},
-        {-41.140915920129665, 288.68019104003906},
-        {-41.140915920129665, 288.6887741088867},
-        {-41.14763798539186, 288.6887741088867},
-        {-41.14763798539186, 288.68019104003906}
-    };
-
-    CLLocationCoordinate2D largeBox[] = {
-        {-41.17710352162799, 288.67298126220703},
-        {-41.13962313627545, 288.67298126220703},
-        {-41.13962313627545, 288.7261962890625},
-        {-41.17710352162799, 288.7261962890625},
-        {-41.17710352162799, 288.67298126220703}
-    };
-
-    MGLPolygonFeature *smallBoxFeature = [MGLPolygonFeature polygonWithCoordinates:smallBox count:sizeof(smallBox)/sizeof(smallBox[0])];
-    MGLPolygonFeature *largeBoxFeature = [MGLPolygonFeature polygonWithCoordinates:largeBox count:sizeof(largeBox)/sizeof(largeBox[0])];
-
-    MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"mutable-data-source-features-id"
-                                                                    shape:smallBoxFeature
-                                                                    options:nil];
-    [self.mapView.style addSource:source];
-
-    MGLFillStyleLayer *layer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"mutable-data-layer-features-id" source:source];
-    layer.fillColor = [NSExpression expressionForConstantValue:[UIColor redColor]];
-    [self.mapView.style addLayer:layer];
-
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        source.shape = largeBoxFeature;
-    });
-}
-
-- (void)styleDynamicPointCollection
-{
-    [self.mapView setCenterCoordinate:CLLocationCoordinate2DMake(36.9979, -109.0441) zoomLevel:14 animated:NO];
-
-    CLLocationCoordinate2D coordinates[] = {
-        {37.00145594210082, -109.04960632324219},
-        {37.00173012609867, -109.0404224395752},
-        {36.99453246847359, -109.04960632324219},
-        {36.99508088541243, -109.04007911682129},
-    };
-    MGLPointCollectionFeature *feature = [MGLPointCollectionFeature pointCollectionWithCoordinates:coordinates count:4];
-    MGLShapeSource *source = [[MGLShapeSource alloc] initWithIdentifier:@"wiggle-source" shape:feature options:nil];
-    [self.mapView.style addSource:source];
-
-    MGLCircleStyleLayer *layer = [[MGLCircleStyleLayer alloc] initWithIdentifier:@"wiggle-layer" source:source];
-    [self.mapView.style addLayer:layer];
-}
-
-- (void)styleVectorTileSource
-{
-    NSURL *url = [[NSURL alloc] initWithString:@"mapbox://mapbox.mapbox-terrain-v2"];
-    MGLVectorTileSource *vectorTileSource = [[MGLVectorTileSource alloc] initWithIdentifier:@"style-vector-tile-source-id" configurationURL:url];
-    [self.mapView.style addSource:vectorTileSource];
-
-    MGLBackgroundStyleLayer *backgroundLayer = [[MGLBackgroundStyleLayer alloc] initWithIdentifier:@"style-vector-background-layer-id"];
-    backgroundLayer.backgroundColor = [NSExpression expressionForConstantValue:[UIColor blackColor]];
-    [self.mapView.style addLayer:backgroundLayer];
-
-    MGLLineStyleLayer *lineLayer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"style-vector-line-layer-id" source:vectorTileSource];
-    lineLayer.sourceLayerIdentifier = @"contour";
-    lineLayer.lineJoin = [NSExpression expressionForConstantValue:@"round"];
-    lineLayer.lineCap = [NSExpression expressionForConstantValue:@"round"];
-    lineLayer.lineColor = [NSExpression expressionForConstantValue:[UIColor greenColor]];
-
-    [self.mapView.style addLayer:lineLayer];
-}
-
-- (void)styleRasterTileSource
-{
-    NSString *tileURL = [NSString stringWithFormat:@"https://stamen-tiles.a.ssl.fastly.net/terrain-background/{z}/{x}/{y}%@.jpg", UIScreen.mainScreen.nativeScale > 1 ? @"@2x" : @""];
-    MGLRasterTileSource *rasterTileSource = [[MGLRasterTileSource alloc] initWithIdentifier:@"style-raster-tile-source-id" tileURLTemplates:@[tileURL] options:@{
-        MGLTileSourceOptionTileSize: @256,
-    }];
-    [self.mapView.style addSource:rasterTileSource];
-
-    MGLRasterStyleLayer *rasterLayer = [[MGLRasterStyleLayer alloc] initWithIdentifier:@"style-raster-layer-id" source:rasterTileSource];
-    [self.mapView.style addLayer:rasterLayer];
-}
-
-- (void)styleImageSource
-{
-    MGLCoordinateQuad coordinateQuad = {
-        { 46.437, -80.425 },
-        { 37.936, -80.425 },
-        { 37.936, -71.516 },
-        { 46.437, -71.516 } };
-
-    MGLImageSource *imageSource = [[MGLImageSource alloc] initWithIdentifier:@"style-image-source-id" coordinateQuad:coordinateQuad URL:[NSURL URLWithString:@"https://www.mapbox.com/mapbox-gl-js/assets/radar0.gif"]];
-
-    [self.mapView.style addSource:imageSource];
-    
-    MGLRasterStyleLayer *rasterLayer = [[MGLRasterStyleLayer alloc] initWithIdentifier:@"style-raster-image-layer-id" source:imageSource];
-    [self.mapView.style addLayer:rasterLayer];
-    
-    [NSTimer scheduledTimerWithTimeInterval:1.0
-                                     target:self
-                                   selector:@selector(updateAnimatedImageSource:)
-                                   userInfo:imageSource
-                                    repeats:YES];
-}
-
-
-- (void)updateAnimatedImageSource:(NSTimer *)timer {
-    static int radarSuffix = 0;
-    MGLImageSource *imageSource = (MGLImageSource *)timer.userInfo;
-    NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"https://www.mapbox.com/mapbox-gl-js/assets/radar%d.gif", radarSuffix++]];
-    [imageSource setValue:url forKey:@"URL"];
-    if (radarSuffix > 3) {
-        radarSuffix = 0;
-    }
-}
-
--(void)toggleStyleLabelsLanguage
+-(void)toggleStyleLabelsLanguage // TODO: Move to ios-sdk-examples
 {
     _localizingLabels = !_localizingLabels;
     [self.mapView.style localizeLabelsIntoLocale:_localizingLabels ? [NSLocale localeWithLocaleIdentifier:@"mul"] : nil];
 }
 
-- (void)styleRouteLine
-{
-    CLLocationCoordinate2D coords[] = {
-        { 43.84455590478528, 10.504238605499268 },
-        { 43.84385562343126, 10.504125952720642 },
-        { 43.84388657526694, 10.503299832344055 },
-        { 43.84332557075269, 10.503235459327698 },
-        { 43.843441641085036, 10.502264499664307 },
-        { 43.84396395478592, 10.50242006778717 },
-        { 43.84406067904351, 10.501744151115416 },
-        { 43.84422317544319, 10.501792430877686 }
-    };
-    NSInteger count = sizeof(coords) / sizeof(coords[0]);
-
-    [self.mapView setCenterCoordinate:coords[0] zoomLevel:16 animated:YES];
-
-    MGLPolylineFeature *routeLine = [MGLPolylineFeature polylineWithCoordinates:coords count:count];
-
-    MGLShapeSource *routeSource = [[MGLShapeSource alloc] initWithIdentifier:@"style-route-source" shape:routeLine options:nil];
-    [self.mapView.style addSource:routeSource];
-
-    MGLLineStyleLayer *baseRouteLayer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"style-base-route-layer" source:routeSource];
-    baseRouteLayer.lineColor = [NSExpression expressionForConstantValue:[UIColor orangeColor]];
-    baseRouteLayer.lineWidth = [NSExpression expressionForConstantValue:@20];
-    baseRouteLayer.lineOpacity = [NSExpression expressionForConstantValue:@0.5];
-    baseRouteLayer.lineCap = [NSExpression expressionForConstantValue:@"round"];
-    baseRouteLayer.lineJoin = [NSExpression expressionForConstantValue:@"round"];
-    [self.mapView.style addLayer:baseRouteLayer];
-
-    MGLLineStyleLayer *routeLayer = [[MGLLineStyleLayer alloc] initWithIdentifier:@"style-route-layer" source:routeSource];
-    routeLayer.lineColor = [NSExpression expressionForConstantValue:[UIColor whiteColor]];
-    routeLayer.lineWidth = [NSExpression expressionForConstantValue:@15];
-    routeLayer.lineOpacity = [NSExpression expressionForConstantValue:@0.8];
-    routeLayer.lineCap = [NSExpression expressionForConstantValue:@"round"];
-    routeLayer.lineJoin = [NSExpression expressionForConstantValue:@"round"];
-    [self.mapView.style addLayer:routeLayer];
-}
-
 - (void)styleAddLimeGreenTriangleLayer
 {
     LimeGreenStyleLayer *layer = [[LimeGreenStyleLayer alloc] initWithIdentifier:@"mbx-custom"];
     [self.mapView.style addLayer:layer];
 }
 
-- (void)stylePolygonWithDDS {
-    CLLocationCoordinate2D leftCoords[] = {
-        {37.73081027834234, -122.49412536621094},
-        {37.7566013348511, -122.49412536621094},
-        {37.7566013348511, -122.46253967285156},
-        {37.73081027834234, -122.46253967285156},
-        {37.73081027834234, -122.49412536621094},
-    };
-    CLLocationCoordinate2D rightCoords[] = {
-        {37.73135334055843, -122.44640350341795},
-        {37.75741564287944, -122.44640350341795},
-        {37.75741564287944, -122.41310119628906},
-        {37.73135334055843, -122.41310119628906},
-        {37.73135334055843, -122.44640350341795},
-    };
-    MGLPolygonFeature *leftFeature = [MGLPolygonFeature polygonWithCoordinates:leftCoords count:5];
-    leftFeature.attributes = @{@"fill": @(YES)};
-
-    MGLPolygonFeature *rightFeature = [MGLPolygonFeature polygonWithCoordinates:rightCoords count:5];
-    rightFeature.attributes = @{@"opacity": @(0.5)};
-
-    MGLShapeSource *shapeSource = [[MGLShapeSource alloc] initWithIdentifier:@"shape-source" features:@[leftFeature, rightFeature] options:nil];
-    [self.mapView.style addSource:shapeSource];
-
-    // source, categorical function that sets any feature with a "fill" attribute value of true to red color and anything without to green
-    MGLFillStyleLayer *fillStyleLayer = [[MGLFillStyleLayer alloc] initWithIdentifier:@"fill-layer" source:shapeSource];
-    fillStyleLayer.fillColor = [NSExpression mgl_expressionForConditional:[NSPredicate predicateWithFormat:@"fill == YES"]
-                                                           trueExpression:[NSExpression expressionForConstantValue:[UIColor greenColor]]
-                                                         falseExpresssion:[NSExpression expressionForConstantValue:[UIColor redColor]]];
-                                                               
-    
-
-    // source, identity function that sets any feature with an "opacity" attribute to use that value and anything without to 1.0
-    fillStyleLayer.fillOpacity = [NSExpression mgl_expressionForConditional:[NSPredicate predicateWithFormat:@"opacity != nil"]
-                                                             trueExpression:[NSExpression expressionForKeyPath:@"opacity"] 
-                                                           falseExpresssion:[NSExpression expressionForConstantValue:@1.0]];
-    [self.mapView.style addLayer:fillStyleLayer];
-}
-
+// TODO: Move to ios-sdk-examples
 - (void)addLatLonGrid
 {
     MGLComputedShapeSource *source = [[MGLComputedShapeSource alloc] initWithIdentifier:@"latlon"
@@ -1597,67 +708,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
     return mostSpecificLanguage ?: @"en";
 }
 
-- (IBAction)startWorldTour
-{
-    _isTouringWorld = YES;
-
-    [self.mapView removeAnnotations:self.mapView.annotations];
-    NSUInteger numberOfAnnotations = sizeof(WorldTourDestinations) / sizeof(WorldTourDestinations[0]);
-    NSMutableArray *annotations = [NSMutableArray arrayWithCapacity:numberOfAnnotations];
-    for (NSUInteger i = 0; i < numberOfAnnotations; i++)
-    {
-        MBXDroppedPinAnnotation *annotation = [[MBXDroppedPinAnnotation alloc] init];
-        annotation.coordinate = WorldTourDestinations[i];
-        [annotations addObject:annotation];
-    }
-    [self.mapView addAnnotations:annotations];
-    [self continueWorldTourWithRemainingAnnotations:annotations];
-}
-
-- (void)continueWorldTourWithRemainingAnnotations:(NSMutableArray<MGLPointAnnotation *> *)annotations
-{
-    MGLPointAnnotation *nextAnnotation = annotations.firstObject;
-    if (!nextAnnotation || !_isTouringWorld)
-    {
-        _isTouringWorld = NO;
-        return;
-    }
-
-    [annotations removeObjectAtIndex:0];
-    MGLMapCamera *camera = [MGLMapCamera cameraLookingAtCenterCoordinate:nextAnnotation.coordinate
-                                                          acrossDistance:10
-                                                                   pitch:arc4random_uniform(60)
-                                                                 heading:arc4random_uniform(360)];
-    __weak MBXViewController *weakSelf = self;
-    [self.mapView flyToCamera:camera completionHandler:^{
-        MBXViewController *strongSelf = weakSelf;
-        [strongSelf performSelector:@selector(continueWorldTourWithRemainingAnnotations:)
-                         withObject:annotations
-                         afterDelay:2];
-    }];
-}
-
-- (void)toggleCustomUserDot
-{
-    _customUserLocationAnnnotationEnabled = !_customUserLocationAnnnotationEnabled;
-    self.mapView.showsUserLocation = NO;
-    self.mapView.userTrackingMode = MGLUserTrackingModeFollow;
-}
-
-- (void)testQueryPointAnnotations {
-    NSNumber *visibleAnnotationCount = @(self.mapView.visibleAnnotations.count);
-    NSString *message;
-    if ([visibleAnnotationCount integerValue] == 1) {
-        message = [NSString stringWithFormat:@"There is %@ visible annotation.", visibleAnnotationCount];
-    } else {
-        message = [NSString stringWithFormat:@"There are %@ visible annotations.", visibleAnnotationCount];
-    }
-
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Visible Annotations" message:message preferredStyle:UIAlertControllerStyleAlert];
-    [alertController addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleCancel handler:nil]];
-    [self presentViewController:alertController animated:YES completion:nil];
-}
-
 - (id<MGLAnnotation>)randomOffscreenPointAnnotation {
 
     NSPredicate *pointAnnotationPredicate = [NSPredicate predicateWithBlock:^BOOL(id  _Nullable evaluatedObject, NSDictionary<NSString *,id> * _Nullable bindings) {
@@ -1954,58 +1004,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
     }
 }
 
-- (IBAction)cycleStyles:(__unused id)sender
-{
-    static NSArray *styleNames;
-    static NSArray *styleURLs;
-
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        styleNames = @[
-            @"Streets",
-            @"Outdoors",
-            @"Light",
-            @"Dark",
-            @"Satellite",
-            @"Satellite Streets",
-        ];
-        styleURLs = @[
-            [MGLStyle streetsStyleURL],
-            [MGLStyle outdoorsStyleURL],
-            [MGLStyle lightStyleURL],
-            [MGLStyle darkStyleURL],
-            [MGLStyle satelliteStyleURL],
-            [MGLStyle satelliteStreetsStyleURL]
-        ];
-        NSAssert(styleNames.count == styleURLs.count, @"Style names and URLs don’t match.");
-
-        // Make sure defaultStyleURLs is up-to-date.
-        unsigned numMethods = 0;
-        Method *methods = class_copyMethodList(object_getClass([MGLStyle class]), &numMethods);
-        unsigned numStyleURLMethods = 0;
-        for (NSUInteger i = 0; i < numMethods; i++) {
-            Method method = methods[i];
-            if (method_getNumberOfArguments(method) == 3 /* _cmd, self, version */) {
-                SEL selector = method_getName(method);
-                NSString *name = @(sel_getName(selector));
-                if ([name hasSuffix:@"StyleURLWithVersion:"]) {
-                    numStyleURLMethods += 1;
-                }
-            }
-        }
-        NSAssert(numStyleURLMethods == styleNames.count,
-                 @"MGLStyle provides %u default styles but iosapp only knows about %lu of them.",
-                 numStyleURLMethods, (unsigned long)styleNames.count);
-    });
-
-    self.styleIndex = (self.styleIndex + 1) % styleNames.count;
-
-    self.mapView.styleURL = styleURLs[self.styleIndex];
-
-    UIButton *titleButton = (UIButton *)self.navigationItem.titleView;
-    [titleButton setTitle:styleNames[self.styleIndex] forState:UIControlStateNormal];
-}
-
 - (IBAction)locateUser:(id)sender
 {
     MGLUserTrackingMode nextMode;
@@ -2038,13 +1036,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
 {
     if (annotation == mapView.userLocation)
     {
-        if (_customUserLocationAnnnotationEnabled)
-        {
-            MBXUserLocationAnnotationView *annotationView = [[MBXUserLocationAnnotationView alloc] initWithFrame:CGRectZero];
-            annotationView.frame = CGRectMake(0, 0, annotationView.intrinsicContentSize.width, annotationView.intrinsicContentSize.height);
-            return annotationView;
-        }
-
         return nil;
     }
     // Use GL backed pins for dropped pin annotations
@@ -2074,7 +1065,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
 
 - (MGLAnnotationImage *)mapView:(MGLMapView * __nonnull)mapView imageForAnnotation:(id <MGLAnnotation> __nonnull)annotation
 {
-    if ([annotation isKindOfClass:[MBXDroppedPinAnnotation class]] || [annotation isKindOfClass:[MBXCustomCalloutAnnotation class]])
+    if ([annotation isKindOfClass:[MBXDroppedPinAnnotation class]])
     {
         return nil; // use default marker
     }
@@ -2190,21 +1181,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
     }];
 }
 
-- (nullable id <MGLCalloutView>)mapView:(__unused MGLMapView *)mapView calloutViewForAnnotation:(id<MGLAnnotation>)annotation
-{
-    if ([annotation respondsToSelector:@selector(title)]
-        && [annotation isKindOfClass:[MBXCustomCalloutAnnotation class]])
-    {
-        MBXCustomCalloutAnnotation *customAnnotation = (MBXCustomCalloutAnnotation *)annotation;
-        MBXCustomCalloutView *calloutView = [[MBXCustomCalloutView alloc] init];
-        calloutView.representedObject = annotation;
-        calloutView.anchoredToAnnotation = customAnnotation.anchoredToAnnotation;
-        calloutView.dismissesAutomatically = customAnnotation.dismissesAutomatically;
-        return calloutView;
-    }
-    return nil;
-}
-
 - (UIView *)mapView:(__unused MGLMapView *)mapView leftCalloutAccessoryViewForAnnotation:(__unused id<MGLAnnotation>)annotation
 {
     UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem];
@@ -2242,31 +1218,6 @@ CLLocationCoordinate2D randomWorldCoordinate() {
     _localizingLabels = [[self bestLanguageForUser] isEqualToString:@"en"];
 }
 
-- (BOOL)mapView:(MGLMapView *)mapView shouldChangeFromCamera:(MGLMapCamera *)oldCamera toCamera:(MGLMapCamera *)newCamera {
-    if (_shouldLimitCameraChanges) {
-        // Get the current camera to restore it after.
-        MGLMapCamera *currentCamera = mapView.camera;
-
-        // From the new camera obtain the center to test if it’s inside the boundaries.
-        CLLocationCoordinate2D newCameraCenter = newCamera.centerCoordinate;
-
-        // Set the map’s visible bounds to newCamera.
-        mapView.camera = newCamera;
-        MGLCoordinateBounds newVisibleCoordinates = mapView.visibleCoordinateBounds;
-
-        // Revert the camera.
-        mapView.camera = currentCamera;
-
-        // Test if the newCameraCenter and newVisibleCoordinates are inside Colorado.
-        BOOL inside = MGLCoordinateInCoordinateBounds(newCameraCenter, colorado);
-        BOOL intersects = MGLCoordinateInCoordinateBounds(newVisibleCoordinates.ne, colorado) && MGLCoordinateInCoordinateBounds(newVisibleCoordinates.sw, colorado);
-
-        return inside && intersects;
-    } else {
-        return YES;
-    }
-}
-
 - (void)mapViewRegionIsChanging:(MGLMapView *)mapView
 {
     [self updateHUD];
@@ -2317,7 +1268,7 @@ CLLocationCoordinate2D randomWorldCoordinate() {
 }
 
 #pragma mark - MGLComputedShapeSourceDataSource
-
+// TODO: Move to ios-sdk-examples
 - (NSArray<id <MGLFeature>>*)featuresInCoordinateBounds:(MGLCoordinateBounds)bounds zoomLevel:(NSUInteger)zoom {
     double gridSpacing;
     if(zoom >= 13) {