Map labels are no longer blank and using China Map Style URLs if the application is configured to use Mapbox China APIs #1558
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import Foundation | ||
| import Mapbox | ||
|
|
||
|
|
||
| extension MGLAccountManager{ | ||
|
|
||
| static let mapboxChinaBaseAPIURL = "https://api.mapbox.cn" | ||
| static let mapboxChinaBaseURLHost = "api.mapbox.cn" | ||
| static let mapboxChinaDayStyleURL = "mapbox://styles/mapbox/streets-zh-v1" | ||
| static let mapboxChinaNightStyleURL = "mapbox://styles/mapbox/dark-zh-v1" | ||
|
|
||
| // Value of whether the map is China map or not | ||
|
There was a problem hiding this comment. Use the |
||
| public class var hasChinaBaseURL : Bool{ | ||
|
There was a problem hiding this comment. Since this is public, let’s make it available to Objective-C code using |
||
| let apiBaseURL = Bundle.main.object(forInfoDictionaryKey:"MGLMapboxAPIBaseURL") as? String | ||
| return apiBaseURL == mapboxChinaBaseAPIURL | ||
| } | ||
|
|
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,26 @@ | ||
| import Foundation | ||
| import Mapbox | ||
|
|
||
|
|
||
| extension MGLStyle { | ||
| // Returns the URL to the current version of the Mapbox Navigation Guidance Day style. | ||
| @objc | ||
| public class var navigationGuidanceDayStyleURL: URL { get { return URL(string: (MGLAccountManager.hasChinaBaseURL ? MGLAccountManager.mapboxChinaDayStyleURL : "mapbox://styles/mapbox/navigation-guidance-day-v2"))! } } | ||
|
There was a problem hiding this comment. I agree with using constants for the China URLs since each gets reused. However, consider turning them into URL-typed static constants within MGLStyle. (There’s no need for string constants if we have constant URLs.) extension MGLStyle {
static let streetsChineseURL = URL(string: "mapbox://styles/mapbox/streets-zh-v1")!
} |
||
|
|
||
| // Returns the URL to the current version of the Mapbox Navigation Guidance Night style. | ||
| @objc | ||
| public class var navigationGuidanceNightStyleURL: URL { get { return URL(string: (MGLAccountManager.hasChinaBaseURL ? MGLAccountManager.mapboxChinaNightStyleURL : "mapbox://styles/mapbox/navigation-guidance-night-v2"))! } } | ||
|
There was a problem hiding this comment. For readability, put this code on multiple lines instead of using a ternary operator. (×4) |
||
|
|
||
| @objc | ||
| // Returns the URL to the given version of the navigation guidance style. Available version are 1, 2, and 3. | ||
|
There was a problem hiding this comment. Add a note that the version is ignored when the API base URL is api.mapbox.cn. (×2) Also, while you’re here, would you mind turning all four of these comments into proper documentation comments using the |
||
| public class func navigationGuidanceDayStyleURL(version: Int) -> URL { | ||
| return URL(string: (MGLAccountManager.hasChinaBaseURL ? MGLAccountManager.mapboxChinaDayStyleURL :"mapbox://styles/mapbox/navigation-guidance-day-v\(version)"))! | ||
| } | ||
| @objc | ||
|
|
||
| // Returns the URL to the given version of the navigation guidance style. Available version are 2, and 3. | ||
| public class func navigationGuidanceNightStyleURL(version: Int) -> URL { | ||
| return URL(string: (MGLAccountManager.hasChinaBaseURL ? MGLAccountManager.mapboxChinaNightStyleURL :"mapbox://styles/mapbox/navigation-guidance-night-v\(version)"))! | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we move the style URLs to the MGLStyle extension?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually u r right. I'll modify that.