summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-09-09 10:29:45 -0700
committerMinh Nguyễn <mxn@1ec5.org>2017-05-12 10:02:27 -0700
commitd85471b7deb9c57973f9b70e0dfe4a8f386c8a01 (patch)
treee350eb8fad8d40b37af00ec8578464d58090b654
parent0ef1293dada1490c808ae821228d5a2f3324afdb (diff)
downloadqtlocation-mapboxgl-d85471b7deb9c57973f9b70e0dfe4a8f386c8a01.tar.gz
[ios, macos] Updated documented default style version
MGLStyleDefaultVersion is just for Streets now. Deleted style version documentation tests because not all styles are on the same version. Cherry-picked from ca97dd8cf4c70a5ed380c99700749fd3239715f0.
-rw-r--r--platform/darwin/src/MGLStyle.h12
-rw-r--r--platform/darwin/test/MGLStyleTests.mm13
2 files changed, 6 insertions, 19 deletions
diff --git a/platform/darwin/src/MGLStyle.h b/platform/darwin/src/MGLStyle.h
index 0e1403b114..ab5a20686a 100644
--- a/platform/darwin/src/MGLStyle.h
+++ b/platform/darwin/src/MGLStyle.h
@@ -10,9 +10,9 @@
NS_ASSUME_NONNULL_BEGIN
/**
- A version number identifying the default version of the suite of default styles
- provided by Mapbox. This version number may be passed into one of the
- “StyleURLWithVersion” class methods of MGLStyle.
+ A version number identifying the default version of the Mapbox Streets style
+ obtained through the `-streetsStyleURL` method. This version number may also be
+ passed into the `-streetsStyleURLWithVersion:` method.
The value of this constant generally corresponds to the latest released version
as of the date on which this SDK was published. You can use this constant to
@@ -72,7 +72,7 @@ MGL_EXPORT
is specified explicitly.
@param version The style’s latest released version. As of publication, the
- current version is `9`.
+ current version is `10`.
*/
+ (NSURL *)streetsStyleURLWithVersion:(NSInteger)version;
@@ -91,7 +91,7 @@ MGL_EXPORT
Outdoors is a general-purpose style tailored to outdoor activities.
@param version The style’s latest released version. As of publication, the
- current version is `9`.
+ current version is `10`.
*/
+ (NSURL *)outdoorsStyleURLWithVersion:(NSInteger)version;
@@ -173,7 +173,7 @@ MGL_EXPORT
Streets.
@param version The style’s latest released version. As of publication, the
- current version is `9`.
+ current version is `10`.
*/
+ (NSURL *)satelliteStreetsStyleURLWithVersion:(NSInteger)version;
diff --git a/platform/darwin/test/MGLStyleTests.mm b/platform/darwin/test/MGLStyleTests.mm
index f9598a143d..8681bddc46 100644
--- a/platform/darwin/test/MGLStyleTests.mm
+++ b/platform/darwin/test/MGLStyleTests.mm
@@ -119,19 +119,6 @@
XCTAssertNil(versionedMethodError, @"Error compiling regular expression to search for versioned methods.");
NSUInteger numVersionedMethodDeclarations = [versionedMethodExpression numberOfMatchesInString:styleHeader options:0 range:NSMakeRange(0, styleHeader.length)];
XCTAssertEqual(numVersionedMethodDeclarations, numVersionedMethods);
-
- // Test that “current version is” statements are present and current for all versioned style methods.
- NSError *versionError;
- NSString *versionExpressionString = @(R"RE(current version is `(\d+)`)RE");
- NSRegularExpression *versionExpression = [NSRegularExpression regularExpressionWithPattern:versionExpressionString options:0 error:&versionError];
- XCTAssertNil(versionError, @"Error compiling regular expression to search for current version statements.");
- NSUInteger numVersionDeclarations = [versionExpression numberOfMatchesInString:styleHeader options:0 range:NSMakeRange(0, styleHeader.length)];
- XCTAssertEqual(numVersionDeclarations, numVersionedMethods);
- [versionExpression enumerateMatchesInString:styleHeader options:0 range:NSMakeRange(0, styleHeader.length) usingBlock:^(NSTextCheckingResult * _Nullable result, NSMatchingFlags flags, BOOL * _Nonnull stop) {
- XCTAssertEqual(result.numberOfRanges, 2, @"Regular expression should have one capture group.");
- NSString *version = [styleHeader substringWithRange:[result rangeAtIndex:1]];
- XCTAssertEqual([version integerValue], MGLStyleDefaultVersion, @"Versioned style URL method should document current version as %ld, not %ld.", MGLStyleDefaultVersion, version.integerValue);
- }];
}
- (void)testName {