#1033 - Moving MBLocationManager to Core GL from app specific instance.

This commit is contained in:
Brad Leege
2015-03-20 11:11:06 -05:00
parent e083c13f65
commit c42e83fcc6
6 changed files with 8 additions and 3 deletions

View File

@@ -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',

View File

@@ -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;

View File

@@ -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());

2
styles

Submodule styles updated: c130393379...25b1b7dff3