diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2015-03-30 16:27:28 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2015-04-03 12:07:53 -0700 |
| commit | 6a1e7d5707762561e4947e90f94c1ede9e2940cc (patch) | |
| tree | 068d7685c569332ac4d7cb09d7b383d6500b0bc7 /gyp | |
| parent | 999ebb371e98bb9ee5876cfad336426c5abae7a8 (diff) | |
| download | qtlocation-mapboxgl-6a1e7d5707762561e4947e90f94c1ede9e2940cc.tar.gz | |
Fixed race condition after setting access token
`Map` should be able to deal with having no access token or JSON even while it’s running. Most of `Map` accounts for this situation, but `reloadStyle()` incorrectly assumes that one or the other is set. This change corrects the assumption in `reloadStyle()`.
Also expose the access token and style name to clients as ordinary KVO-compliant properties. Actually, they’re not so ordinary because they’re inspectable!
Ref #1070, #1147
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/platform-ios.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 9965db57ac..fc6771d83a 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -30,6 +30,8 @@ '../include/mbgl/ios/MGLMetricsLocationManager.h', '../platform/ios/MGLMetricsLocationManager.m', '../include/mbgl/ios/MGLTypes.h', + '../platform/ios/NSString+MGLAdditions.h', + '../platform/ios/NSString+MGLAdditions.m', '../platform/ios/vendor/SMCalloutView/SMCalloutView.h', '../platform/ios/vendor/SMCalloutView/SMCalloutView.m', ], @@ -50,6 +52,7 @@ '-framework MobileCoreServices', '-framework QuartzCore', '-framework SystemConfiguration', + '-ObjC', ], }, |