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

Merge remote-tracking branch 'upstream/master' into perspective-without-y-flip

Browse Source
This commit is contained in:
Jason Wray
2015-08-26 11:03:34 -07:00
parent 0e456940b9 2f30dfe97d
commit d8ed33c7d4
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/ios/MGLMapView.mm
View File

@@ -2214,7 +2214,15 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng)
[NSException raise:@"Missing Location Services usage description" format:
@"In iOS 8 and above, this app must have a value for NSLocationWhenInUseUsageDescription or NSLocationAlwaysUsageDescription in its Info.plist."];
}
[self.locationManager requestWhenInUseAuthorization];
// request location permissions, if both keys exist ask for less permissive
if ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationWhenInUseUsageDescription"])
{
[self.locationManager requestWhenInUseAuthorization];
}
else if ([[NSBundle mainBundle] objectForInfoDictionaryKey:@"NSLocationAlwaysUsageDescription"])
{
[self.locationManager requestAlwaysAuthorization];
}
}
#endif
@@ -2302,6 +2310,7 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng)
break;
}
case MGLUserTrackingModeFollow:
case MGLUserTrackingModeFollowWithCourse:
{
self.showsUserLocation = YES;
@@ -2315,7 +2324,6 @@ CLLocationCoordinate2D MGLLocationCoordinate2DFromLatLng(mbgl::LatLng latLng)
break;
}
case MGLUserTrackingModeFollowWithHeading:
case MGLUserTrackingModeFollowWithCourse:
{
self.showsUserLocation = YES;

4
test/ios/MapViewTests.m
View File

@@ -544,7 +544,7 @@
- (void)testUserTrackingModeFollow {
tester.mapView.userTrackingMode = MGLUserTrackingModeFollow;
[tester waitForTimeInterval:1];
[tester acknowledgeSystemAlert];
XCTAssertEqual(tester.mapView.userLocationVisible,
YES,
@@ -570,7 +570,7 @@
- (void)testUserTrackingModeFollowWithHeading {
tester.mapView.userTrackingMode = MGLUserTrackingModeFollowWithHeading;
[tester waitForTimeInterval:1];
[tester acknowledgeSystemAlert];
XCTAssertEqual(tester.mapView.userLocationVisible,
YES,

10
test/ios/MetricsTests.m
View File

@@ -119,7 +119,7 @@ const NSTimeInterval MGLFlushInterval = 60;
[[MGLMapboxEvents sharedManager] flush];
[self waitForExpectationsWithTimeout:1.0 handler:nil];
[self waitForExpectationsWithTimeout:2.0 handler:nil];
XCTAssertNil([[MGLMapboxEvents sharedManager] timer]);
}
@@ -143,7 +143,7 @@ const NSTimeInterval MGLFlushInterval = 60;
id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]];
[[[eventsMock expect] andForwardToRealObject] startTimer];
[self pushFakeEvent];
[eventsMock verifyWithDelay:0.5];
[eventsMock verifyWithDelay:2.0];
XCTAssertEqual([[[MGLMapboxEvents sharedManager] eventQueue] count], 1);
XCTAssertNotNil([[MGLMapboxEvents sharedManager] timer]);
@@ -164,7 +164,7 @@ const NSTimeInterval MGLFlushInterval = 60;
[[MGLMapboxEvents sharedManager] flush];
[self waitForExpectationsWithTimeout:1.0 handler:nil];
[self waitForExpectationsWithTimeout:2.0 handler:nil];
[self pushFakeEvent];
id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]];
@@ -178,7 +178,7 @@ const NSTimeInterval MGLFlushInterval = 60;
id eventsMock = [OCMockObject partialMockForObject:[MGLMapboxEvents sharedManager]];
[[eventsMock expect] postEvents:events];
[[MGLMapboxEvents sharedManager] flush];
[eventsMock verifyWithDelay:1.0];
[eventsMock verifyWithDelay:2.0];
XCTAssertTrue([[[MGLMapboxEvents sharedManager] eventQueue] count] == 0);
}
@@ -209,7 +209,7 @@ const NSTimeInterval MGLFlushInterval = 60;
[self pushFakeEvent];
[MGLMapboxEvents flush];
[self waitForExpectationsWithTimeout:1.0 handler:nil];
[self waitForExpectationsWithTimeout:2.0 handler:nil];
}
- (void)testPushEventAddsToEventQueue {