[iOS, macOS] Set `MGLIdeographicFontFamilyName` to a Boolean value `NO` for using your custom remote font.

2 files changed, 9 insertions, 6 deletions

diff --git a/platform/darwin/src/MGLRendererConfiguration.h b/platform/darwin/src/MGLRendererConfiguration.h
index f8ac872d56..bbcc3a8c75 100644
--- a/platform/darwin/src/MGLRendererConfiguration.h
+++ b/platform/darwin/src/MGLRendererConfiguration.h
@@ -30,13 +30,14 @@ MGL_EXPORT
  system default font.
  
  Set `MGLIdeographicFontFamilyName` in your containing app's Info.plist to a string
- value which will be available at run time, e.g. "PingFang TC".
+ value for using your specific local font which will be available at run time,
+ e.g. "PingFang TC".
  
  Set `MGLIdeographicFontFamilyName` in your containing app's Info.plist to a array of
  font family names. Once the front ones are unavaiable, it will fallback to others until
  using default system font.
  
- Set `MGLIdeographicFontFamilyName` to `NULL` for using your custom remote font.
+ Set `MGLIdeographicFontFamilyName` to a Boolean value `NO` for using your custom remote font.
  */
 @property (nonatomic, readonly) mbgl::optional<std::string> localFontFamilyName;
 
diff --git a/platform/darwin/src/MGLRendererConfiguration.mm b/platform/darwin/src/MGLRendererConfiguration.mm
index 4bb5ffa7e6..3ae0c1a6c6 100644
--- a/platform/darwin/src/MGLRendererConfiguration.mm
+++ b/platform/darwin/src/MGLRendererConfiguration.mm
@@ -79,11 +79,13 @@ static NSString * const MGLCollisionBehaviorPre4_0Key = @"MGLCollisionBehaviorPr
 #endif
 
     id fontFamilyName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographicFontFamilyName"];
-    if([fontFamilyName isKindOfClass:[NSString class]])
+    
+    if([fontFamilyName isKindOfClass:[NSNumber class]] && ![fontFamilyName boolValue])
+    {
+        return mbgl::optional<std::string>();
+    }
+    else if([fontFamilyName isKindOfClass:[NSString class]])
     {
-        if([fontFamilyName isEqualToString:@"NULL"]){
-            return mbgl::optional<std::string>();
-        }
         return fontFamilyName ? std::string([fontFamilyName UTF8String]) : systemFontFamilyName;
     }
     //Ability to specify an array of fonts for fallbacks for `localIdeographicFontFamily`