From 6a1e7d5707762561e4947e90f94c1ede9e2940cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Mon, 30 Mar 2015 16:27:28 -0700 Subject: Fixed race condition after setting access token MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `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 --- gyp/platform-ios.gypi | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gyp') 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', ], }, -- cgit v1.2.1