1 files changed, 19 insertions, 65 deletions

diff --git a/platform/ios/MGLMetricsLocationManager.m b/platform/ios/MGLMetricsLocationManager.m
index 5eac0370dc..c0ff740b3a 100644
--- a/platform/ios/MGLMetricsLocationManager.m
+++ b/platform/ios/MGLMetricsLocationManager.m
@@ -1,48 +1,18 @@
-//
-//  MBLocationManager.m
-//  Hermes
-//
-//  Dynamic Settings.bundle loading based on:
-//  http://stackoverflow.com/questions/510216/can-you-make-the-settings-in-settings-bundle-default-even-if-you-dont-open-the
-//
-//  Created by Brad Leege on 3/8/15.
-//  Copyright (c) 2015 Mapbox. All rights reserved.
-//
-
-#import "MGLMetricsLocationManager.h"
-#import "CoreLocation/CoreLocation.h"
 #import "MGLMapboxEvents.h"
+#import "MGLMetricsLocationManager.h"
 
-@interface MGLMetricsLocationManager()
+#import <CoreLocation/CoreLocation.h>
 
-@property (atomic) CLLocationManager *locationManager;
+@interface MGLMetricsLocationManager() <CLLocationManagerDelegate>
+
+@property (nonatomic) CLLocationManager *locationManager;
 
 @end
 
 @implementation MGLMetricsLocationManager
 
-static MGLMetricsLocationManager *sharedManager = nil;
-
-- (id) init {
+- (instancetype) init {
     if (self = [super init]) {
-        
-        NSString *settingsBundle = [[NSBundle mainBundle] pathForResource:@"Settings" ofType:@"bundle"];
-        if(!settingsBundle) {
-            NSLog(@"Could not find Settings.bundle");
-        } else {
-            NSDictionary *settings = [NSDictionary dictionaryWithContentsOfFile:[settingsBundle stringByAppendingPathComponent:@"Root.plist"]];
-            NSArray *preferences = [settings objectForKey:@"PreferenceSpecifiers"];
-            NSMutableDictionary *defaultsToRegister = [[NSMutableDictionary alloc] initWithCapacity:[preferences count]];
-            for(NSDictionary *prefSpecification in preferences) {
-                NSString *key = [prefSpecification objectForKey:@"Key"];
-                if(key && [[prefSpecification allKeys] containsObject:@"DefaultValue"]) {
-                    [defaultsToRegister setObject:[prefSpecification objectForKey:@"DefaultValue"] forKey:key];
-                }
-            }
-            
-            [[NSUserDefaults standardUserDefaults] registerDefaults:defaultsToRegister];
-        }
-        
         _locationManager = [[CLLocationManager alloc] init];
         _locationManager.distanceFilter = 2;
         _locationManager.desiredAccuracy = kCLLocationAccuracyBest;
@@ -52,46 +22,31 @@ static MGLMetricsLocationManager *sharedManager = nil;
     return self;
 }
 
-+ (id)sharedManager {
++ (instancetype)sharedManager {
     static dispatch_once_t onceToken;
+    static MGLMetricsLocationManager *sharedManager;
     dispatch_once(&onceToken, ^{
         sharedManager = [[self alloc] init];
     });
     return sharedManager;
 }
 
-- (BOOL) isAuthorizedStatusDetermined {
-    return ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusNotDetermined);
-}
-
-- (void) requestAlwaysAuthorization {
-    if ([self.locationManager respondsToSelector:@selector(requestAlwaysAuthorization)]) {
-        [self.locationManager requestAlwaysAuthorization];
-    } else {
-        // This is iOS 7 or below so Starting Location Updates will trigger authorization request
-        [self startUpdatingLocation];
-    }
-}
-
-- (void) startUpdatingLocation {
-    [self.locationManager startUpdatingLocation];
++ (void) startUpdatingLocation {
+    [[MGLMetricsLocationManager sharedManager].locationManager startUpdatingLocation];
 }
 
-- (void) stopUpdatingLocation {
-    [self.locationManager stopUpdatingLocation];
++ (void) stopUpdatingLocation {
+    [[MGLMetricsLocationManager sharedManager].locationManager stopUpdatingLocation];
 }
 
 #pragma mark CLLocationManagerDelegate
 - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations {
-    CLLocation *loc = (CLLocation *)[locations objectAtIndex:0];
-    NSLog(@"didUpdateLocations() called  with %lu location in array.  First Location = %f, %f", (unsigned long)locations.count, loc.coordinate.latitude, loc.coordinate.longitude);
-    
     //  Iterate through locations to pass all data
     for (CLLocation *loc in locations) {
-        NSMutableDictionary *evt = [[NSMutableDictionary alloc] init];
-        [evt setValue:[[NSNumber alloc] initWithDouble:loc.coordinate.latitude] forKey:@"lat"];
-        [evt setValue:[[NSNumber alloc] initWithDouble:loc.coordinate.longitude] forKey:@"lng"];
-        [[MGLMapboxEvents sharedManager] pushEvent:@"location" withAttributes:evt];
+        [MGLMapboxEvents pushEvent:MGLEventTypeLocation withAttributes:@{
+            MGLEventKeyLatitude: @(loc.coordinate.latitude),
+            MGLEventKeyLongitude: @(loc.coordinate.longitude)
+        }];
     }
 }
 
@@ -106,24 +61,23 @@ static MGLMetricsLocationManager *sharedManager = nil;
             break;
         case kCLAuthorizationStatusDenied:
             newStatus = @"User Explcitly Denied";
-            [[MGLMetricsLocationManager sharedManager] stopUpdatingLocation];
+            [MGLMetricsLocationManager stopUpdatingLocation];
             break;
         case kCLAuthorizationStatusAuthorized:
             newStatus = @"User Has Authorized / Authorized Always";
-            [[MGLMetricsLocationManager sharedManager] startUpdatingLocation];
+            [MGLMetricsLocationManager startUpdatingLocation];
             break;
             //        case kCLAuthorizationStatusAuthorizedAlways:
             //            newStatus = @"Not Determined";
             //            break;
         case kCLAuthorizationStatusAuthorizedWhenInUse:
             newStatus = @"User Has Authorized When In Use Only";
-            [[MGLMetricsLocationManager sharedManager] startUpdatingLocation];
+            [MGLMetricsLocationManager startUpdatingLocation];
             break;
         default:
             newStatus = @"Unknown";
             break;
     }
-    NSLog(@"MGLMetricsLocationManager didChangeAuthorizationStatus() called.  New Status = %@", newStatus);
 }
 
 @end