This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[iOS] Update annotation view touch handling (with offsets) (#12234)
- Loading branch information
Showing
6 changed files
with
143 additions
and
20 deletions.
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
108 changes: 108 additions & 0 deletions
108
platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.m
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,108 @@ | ||
| #import "MGLMapViewIntegrationTest.h" | ||
| #import "MGLTestUtility.h" | ||
| #import "MGLMapAccessibilityElement.h" | ||
|
|
||
| @interface MGLMapView (Tests) | ||
| - (MGLAnnotationTag)annotationTagAtPoint:(CGPoint)point persistingResults:(BOOL)persist; | ||
| @end | ||
|
|
||
| @interface MGLAnnotationViewIntegrationTests : MGLMapViewIntegrationTest | ||
| @end | ||
|
|
||
| @implementation MGLAnnotationViewIntegrationTests | ||
|
|
||
| - (void)testSelectingAnnotationWithCenterOffset { | ||
|
|
||
| for (CGFloat dx = -100.0; dx <= 100.0; dx += 100.0 ) { | ||
| for (CGFloat dy = -100.0; dy <= 100.0; dy += 100.0 ) { | ||
| CGVector offset = CGVectorMake(dx, dy); | ||
| [self internalTestSelectingAnnotationWithCenterOffsetWithOffset:offset]; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| - (void)internalTestSelectingAnnotationWithCenterOffsetWithOffset:(CGVector)offset { | ||
|
|
||
| NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReuseIdentifer"; | ||
|
|
||
| CGFloat epsilon = 0.0000001; | ||
| CGSize size = self.mapView.bounds.size; | ||
|
|
||
| CGSize annotationSize = CGSizeMake(40.0, 40.0); | ||
|
|
||
| self.viewForAnnotation = ^MGLAnnotationView*(MGLMapView *view, id<MGLAnnotation> annotation) { | ||
|
|
||
| if (![annotation isKindOfClass:[MGLPointAnnotation class]]) { | ||
| return nil; | ||
| } | ||
|
|
||
| // No dequeue | ||
| MGLAnnotationView *annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:MGLTestAnnotationReuseIdentifer]; | ||
| annotationView.bounds = (CGRect){ .origin = CGPointZero, .size = annotationSize }; | ||
| annotationView.backgroundColor = UIColor.redColor; | ||
| annotationView.enabled = YES; | ||
| annotationView.centerOffset = offset; | ||
|
|
||
| return annotationView; | ||
| }; | ||
|
|
||
| MGLPointAnnotation *point = [[MGLPointAnnotation alloc] init]; | ||
| point.title = NSStringFromSelector(_cmd); | ||
| point.coordinate = CLLocationCoordinate2DMake(0.0, 0.0); | ||
| [self.mapView addAnnotation:point]; | ||
|
|
||
| // From https://github.com/mapbox/mapbox-gl-native/issues/12259#issuecomment-401414168 | ||
| // | ||
| // queryRenderedFeatures depends on collision detection having been run | ||
| // before it shows results [...]. Collision detection runs asynchronously | ||
| // (at least every 300ms, sometimes more often), and therefore the results | ||
| // of queryRenderedFeatures are similarly asynchronous. | ||
| // | ||
| // So, we need to wait before `annotationTagAtPoint:persistingResults:` will | ||
| // return out newly added annotation | ||
|
|
||
| [self waitForCollisionDetectionToRun]; | ||
|
|
||
| // Check that the annotation is in the center of the view | ||
| CGPoint annotationPoint = [self.mapView convertCoordinate:point.coordinate toPointToView:self.mapView]; | ||
| XCTAssertEqualWithAccuracy(annotationPoint.x, size.width/2.0, epsilon); | ||
| XCTAssertEqualWithAccuracy(annotationPoint.y, size.height/2.0, epsilon); | ||
|
|
||
| // Now test taps around the annotation | ||
| CGPoint tapPoint = CGPointMake(annotationPoint.x + offset.dx, annotationPoint.y + offset.dy); | ||
|
|
||
| MGLAnnotationTag tagAtPoint = [self.mapView annotationTagAtPoint:tapPoint persistingResults:YES]; | ||
| XCTAssert(tagAtPoint != UINT32_MAX, @"Should have tapped on annotation"); | ||
|
|
||
| CGPoint testPoints[] = { | ||
| { tapPoint.x - annotationSize.width, tapPoint.y }, | ||
| { tapPoint.x + annotationSize.width, tapPoint.y }, | ||
| { tapPoint.x, tapPoint.y - annotationSize.height }, | ||
| { tapPoint.x, tapPoint.y + annotationSize.height }, | ||
| CGPointZero | ||
| }; | ||
|
|
||
| CGPoint *testPoint = testPoints; | ||
|
|
||
| while (!CGPointEqualToPoint(*testPoint, CGPointZero)) { | ||
| tagAtPoint = [self.mapView annotationTagAtPoint:*testPoints persistingResults:YES]; | ||
| XCTAssert(tagAtPoint == UINT32_MAX, @"Tap should to the side of the annotation"); | ||
| testPoint++; | ||
| } | ||
| } | ||
|
|
||
| - (void)waitForCollisionDetectionToRun { | ||
| XCTAssertNil(self.renderFinishedExpectation, @"Incorrect test setup"); | ||
|
|
||
| self.renderFinishedExpectation = [self expectationWithDescription:@"Map view should be rendered"]; | ||
| XCTestExpectation *timerExpired = [self expectationWithDescription:@"Timer expires"]; | ||
|
|
||
| // Wait 1/2 second | ||
| dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(NSEC_PER_SEC >> 1)), dispatch_get_main_queue(), ^{ | ||
| [timerExpired fulfill]; | ||
| }); | ||
|
|
||
| [self waitForExpectations:@[timerExpired, self.renderFinishedExpectation] timeout:1.0]; | ||
| } | ||
|
|
||
| @end |
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
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