tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ios, macos] Hard-code Null Island for runtime styling test

Browse Source 
Relying on the stylesheet to jump from an invalid camera to Null Island seems to introduce a race condition where the tiles don’t render by the time the snapshot takes place.
This commit is contained in:
Minh Nguyễn
2020-04-30 17:53:07 -07:00
committed by Minh Nguyễn
parent 1b4c422c5c
commit 93141ac0f0
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platform/darwin/test/MGLMapSnapshotterTests.m
View File

@@ -141,7 +141,7 @@ MGLImage *MGLImageFromCurrentContext() {
}
- (void)testRuntimeStyling {
[self testStyleURL:nil applyingRuntimeStylingActions:^(MGLStyle *style) {
[self testStyleURL:nil camera:[MGLMapCamera camera] applyingRuntimeStylingActions:^(MGLStyle *style) {
MGLBackgroundStyleLayer *backgroundLayer = [[MGLBackgroundStyleLayer alloc] initWithIdentifier:@"background"];
backgroundLayer.backgroundColor = [NSExpression expressionForConstantValue:[MGLColor orangeColor]];
[style addLayer:backgroundLayer];
@@ -151,16 +151,17 @@ MGLImage *MGLImageFromCurrentContext() {
- (void)testLocalGlyphRendering {
[[NSUserDefaults standardUserDefaults] setObject:@[@"PingFang TC"] forKey:@"MGLIdeographicFontFamilyName"];
NSURL *styleURL = [[NSBundle bundleForClass:[self class]] URLForResource:@"mixed" withExtension:@"json"];
[self testStyleURL:styleURL applyingRuntimeStylingActions:^(MGLStyle *style) {} expectedImageName:@"Fixtures/MGLMapSnapshotterTests/PingFang"];
[self testStyleURL:styleURL camera:nil applyingRuntimeStylingActions:^(MGLStyle *style) {} expectedImageName:@"Fixtures/MGLMapSnapshotterTests/PingFang"];
}
/**
Tests that applying the given runtime styling actions on a blank style results in a snapshot image that matches the image with the given name in the asset catalog.
@param actions Runtime styling actions to apply to the blank style.
@param camera The camera to show, or `nil` to show the style’s default camera.
@param expectedImageName Name of the test fixture image in Media.xcassets.
*/
- (void)testStyleURL:(nullable NSURL *)styleURL applyingRuntimeStylingActions:(void (^)(MGLStyle *style))actions expectedImageName:(NSString *)expectedImageName {
- (void)testStyleURL:(nullable NSURL *)styleURL camera:(nullable MGLMapCamera *)camera applyingRuntimeStylingActions:(void (^)(MGLStyle *style))actions expectedImageName:(NSString *)expectedImageName {
self.styleLoadingExpectation = [self expectationWithDescription:@"Style should finish loading."];
XCTestExpectation *overlayExpectation = [self expectationWithDescription:@"Overlay handler should get called."];
XCTestExpectation *completionExpectation = [self expectationWithDescription:@"Completion handler should get called."];
@@ -175,12 +176,17 @@ MGLImage *MGLImageFromCurrentContext() {
if (!styleURL) {
styleURL = [[NSBundle bundleForClass:[self class]] URLForResource:@"one-liner" withExtension:@"json"];
}
MGLMapCamera *camera = [MGLMapCamera camera];
camera.centerCoordinate = kCLLocationCoordinate2DInvalid;
camera.heading = -1;
camera.pitch = -1;
MGLMapSnapshotOptions *options = [[MGLMapSnapshotOptions alloc] initWithStyleURL:styleURL camera:camera size:expectedImage.size];
options.zoomLevel = -1;
MGLMapCamera *defaultCamera = camera ?: [MGLMapCamera camera];
if (!camera) {
defaultCamera.centerCoordinate = kCLLocationCoordinate2DInvalid;
defaultCamera.heading = -1;
defaultCamera.pitch = -1;
}
MGLMapSnapshotOptions *options = [[MGLMapSnapshotOptions alloc] initWithStyleURL:styleURL camera:defaultCamera size:expectedImage.size];
if (!camera) {
options.zoomLevel = -1;
}
MGLMapSnapshotter *snapshotter = [[MGLMapSnapshotter alloc] initWithOptions:options];
snapshotter.delegate = self;

2
platform/darwin/test/one-liner.json
View File

@@ -1 +1 @@
{"version":8,"sources":{},"layers":[],"center":[0,0],"zoom":0}
{"version":8,"sources":{},"layers":[]}