summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@gmail.com>2018-11-26 14:31:28 -0500
committerGitHub <noreply@github.com>2018-11-26 14:31:28 -0500
commitcca37e765bf9b853262783a6f7cc3d1a4c72957d (patch)
tree962461782b5ff4130ab1d2a6026cda3898181611
parent52cce7925d32181a20a79978479c5552fa6ae810 (diff)
downloadqtlocation-mapboxgl-cca37e765bf9b853262783a6f7cc3d1a4c72957d.tar.gz
Updated Info.plist docs. (#13436)
-rw-r--r--.github/CODEOWNERS3
-rw-r--r--platform/ios/docs/guides/Info.plist Keys.md4
2 files changed, 6 insertions, 1 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2961f0f5c3..571f6b51b8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,8 +1,11 @@
# iOS
/platform/ios/ @mapbox/maps-ios-reviewers
+/platform/ios/docs/ @mapbox/docs
# macOS
/platform/macos/ @1ec5 @mapbox/maps-ios-reviewers
+/platform/macos/docs @mapbox/docs
+
# Darwin
/platform/darwin/ @1ec5 @mapbox/maps-ios-reviewers
diff --git a/platform/ios/docs/guides/Info.plist Keys.md b/platform/ios/docs/guides/Info.plist Keys.md
index 9e753b2d79..474651970d 100644
--- a/platform/ios/docs/guides/Info.plist Keys.md
+++ b/platform/ios/docs/guides/Info.plist Keys.md
@@ -28,4 +28,6 @@ The name of the font family to use for client-side text rendering of CJK ideogra
If this key is set to YES (`true`), collision detection is performed only between symbol style layers based on the same source, as in versions 2.0–3.7 of the Mapbox Maps SDK for iOS. In other words, symbols in an `MGLSymbolStyleLayer` based on one source (for example, an `MGLShapeSource`) may overlap with symbols in another layer that is based on a different source (such as the Mapbox Streets source). This is the case regardless of the `MGLSymbolStyleLayer.iconAllowsOverlap`, `MGLSymbolStyleLayer.iconIgnoresPlacement`, `MGLSymbolStyleLayer.textAllowsOverlap`, and `MGLSymbolStyleLayer.textIgnoresPlacement` properties.
-Beginning in version 4.0, the SDK also performs collision detection between style layers based on different sources by default. For the default behavior, omit the `MGLCollisionBehaviorPre4_0` key or set it to NO (`false`). \ No newline at end of file
+Beginning in version 4.0, the SDK also performs collision detection between style layers based on different sources by default. For the default behavior, omit the `MGLCollisionBehaviorPre4_0` key or set it to NO (`false`).
+
+This property may also be set using `[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:@"MGLCollisionBehaviorPre4_0"]`; it will override any value specified in the `Info.plist`. \ No newline at end of file