diff options
| -rw-r--r-- | gyp/platform-ios.gypi | 2 | ||||
| -rw-r--r-- | include/mbgl/ios/MBLocationManager.h (renamed from ios/app/MBLocationManager.h) | 0 | ||||
| -rw-r--r-- | ios/app/MBXViewController.mm | 2 | ||||
| -rw-r--r-- | platform/ios/MBLocationManager.m (renamed from ios/app/MBLocationManager.m) | 0 | ||||
| -rw-r--r-- | platform/ios/MGLMapView.mm | 5 | ||||
| m--------- | styles | 0 |
6 files changed, 7 insertions, 2 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index a8a827af65..f3191659a5 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -16,6 +16,8 @@ '../platform/darwin/asset_root.mm', '../platform/darwin/image.mm', '../platform/darwin/reachability.m', + '../include/mbgl/ios/MBLocationManager.h', + '../platform/ios/MBLocationManager.m', '../include/mbgl/ios/MGLMapView.h', '../platform/ios/MGLMapView.mm', '../include/mbgl/ios/MGLStyleFunctionValue.h', diff --git a/ios/app/MBLocationManager.h b/include/mbgl/ios/MBLocationManager.h index 84a847c9e7..84a847c9e7 100644 --- a/ios/app/MBLocationManager.h +++ b/include/mbgl/ios/MBLocationManager.h diff --git a/ios/app/MBXViewController.mm b/ios/app/MBXViewController.mm index 822549070d..98b337f927 100644 --- a/ios/app/MBXViewController.mm +++ b/ios/app/MBXViewController.mm @@ -5,7 +5,6 @@ #import <mbgl/platform/darwin/settings_nsuserdefaults.hpp> #import <CoreLocation/CoreLocation.h> -#import "MBLocationManager.h" static UIColor *const kTintColor = [UIColor colorWithRed:0.120 green:0.550 blue:0.670 alpha:1.000]; @@ -40,7 +39,6 @@ mbgl::Settings_NSUserDefaults *settings = nullptr; { [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(saveState:) name:UIApplicationDidEnterBackgroundNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(restoreState:) name:UIApplicationWillEnterForegroundNotification object:nil]; - [MBLocationManager sharedManager]; } return self; diff --git a/ios/app/MBLocationManager.m b/platform/ios/MBLocationManager.m index 9aa235fc23..9aa235fc23 100644 --- a/ios/app/MBLocationManager.m +++ b/platform/ios/MBLocationManager.m diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm index 281755a4c8..0592683d66 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/MGLMapView.mm @@ -21,6 +21,8 @@ #import "NSArray+MGLAdditions.h" #import "NSDictionary+MGLAdditions.h" +#import "MBLocationManager.h" + // Returns the path to the default cache database on this system. const std::string &defaultCacheDatabase() { @@ -338,6 +340,9 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appDidBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(appWillForeground:) name:UIApplicationWillEnterForegroundNotification object:nil]; + // Setup MBLocationManager for metrics + [MBLocationManager sharedManager]; + // set initial position // mbglMap->setLatLngZoom(mbgl::LatLng(0, 0), mbglMap->getMinZoom()); diff --git a/styles b/styles -Subproject c1303933798e1bb48649d8a64b71038b4d3ed0a +Subproject 25b1b7dff37a18151e3286144bc8013b432a886 |