From bef2a7ccb6e800d2ca6f2bac5c863b49fbba103d Mon Sep 17 00:00:00 2001
From: Julian Rex <julian.rex@gmail.com>
Date: Mon, 21 May 2018 14:14:58 -0400
Subject: [ios,macos] Fix for infinite loop crash when setting shape to nil in
 MGLMapViewDelegate methods (#11614)

---
 platform/ios/Integration Tests/MGLMapViewIntegrationTest.m | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'platform/ios/Integration Tests/MGLMapViewIntegrationTest.m')

diff --git a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m
index fc3229c83b..c42b8eef89 100644
--- a/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m	
+++ b/platform/ios/Integration Tests/MGLMapViewIntegrationTest.m	
@@ -45,9 +45,9 @@
     self.renderFinishedExpectation = nil;
 }
 
-- (void)mapView:(MGLMapView *)mapView regionDidChangeAnimated:(BOOL)animated {
-    if (self.regionDidChange) {
-        self.regionDidChange(mapView, animated);
+- (void)mapView:(MGLMapView *)mapView regionWillChangeAnimated:(BOOL)animated {
+    if (self.regionWillChange) {
+        self.regionWillChange(mapView, animated);
     }
 }
 
@@ -57,6 +57,12 @@
     }
 }
 
+- (void)mapView:(MGLMapView *)mapView regionDidChangeWithReason:(MGLCameraChangeReason)reason animated:(BOOL)animated {
+    if (self.regionDidChange) {
+        self.regionDidChange(mapView, reason, animated);
+    }
+}
+
 #pragma mark - Utilities
 
 - (void)waitForMapViewToFinishLoadingStyleWithTimeout:(NSTimeInterval)timeout {
-- 
cgit v1.2.1