From 9d0b67450db99d2653ac45a9150b2f2817391b88 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Fri, 8 May 2015 14:53:39 -0500 Subject: [PATCH 1/3] #1481 - Replacing flushAt with eventQueue count of upper range limit --- platform/ios/MGLMapboxEvents.m | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m index fe19291ab..d49adab6c 100644 --- a/platform/ios/MGLMapboxEvents.m +++ b/platform/ios/MGLMapboxEvents.m @@ -408,14 +408,15 @@ NSString *const MGLEventGestureRotateStart = @"Rotation"; __block NSArray *events; - NSUInteger upper = strongSelf.flushAt; - if (strongSelf.flushAt > [_eventQueue count]) { - if ([_eventQueue count] == 0) { - return; - } - upper = [_eventQueue count]; - } - + NSUInteger upper = [_eventQueue count]; +// if (strongSelf.flushAt > [_eventQueue count]) { +// if ([_eventQueue count] == 0) { +// return; +// } +// upper = [_eventQueue count]; +// } + NSLog(@"upper = %d", upper); + // Create Array of Events to push to the Server NSRange theRange = NSMakeRange(0, upper); events = [_eventQueue subarrayWithRange:theRange]; From 2eef6b44126428a1994dbf88564888bf1b11f222 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Fri, 8 May 2015 15:02:32 -0500 Subject: [PATCH 2/3] #1481 - Refactoring to use iOS -copy and -removeAllObjects to get away from having to do potentially less stable index calculations --- platform/ios/MGLMapboxEvents.m | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m index d49adab6c..f7e50f6f4 100644 --- a/platform/ios/MGLMapboxEvents.m +++ b/platform/ios/MGLMapboxEvents.m @@ -408,21 +408,11 @@ NSString *const MGLEventGestureRotateStart = @"Rotation"; __block NSArray *events; - NSUInteger upper = [_eventQueue count]; -// if (strongSelf.flushAt > [_eventQueue count]) { -// if ([_eventQueue count] == 0) { -// return; -// } -// upper = [_eventQueue count]; -// } - NSLog(@"upper = %d", upper); - - // Create Array of Events to push to the Server - NSRange theRange = NSMakeRange(0, upper); - events = [_eventQueue subarrayWithRange:theRange]; + // Make an immutable copy + events = [_eventQueue copy]; // Update Queue to remove events sent to server - [_eventQueue removeObjectsInRange:theRange]; + [_eventQueue removeAllObjects]; // Send Array of Events to Server [strongSelf postEvents:events]; From 08f1d4b511ee8193735629214faeabf634617731 Mon Sep 17 00:00:00 2001 From: Brad Leege Date: Fri, 8 May 2015 15:24:19 -0500 Subject: [PATCH 3/3] #1481 - Changing events array to be created with +arrayWithArray --- platform/ios/MGLMapboxEvents.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/MGLMapboxEvents.m index f7e50f6f4..3a6559b76 100644 --- a/platform/ios/MGLMapboxEvents.m +++ b/platform/ios/MGLMapboxEvents.m @@ -409,8 +409,8 @@ NSString *const MGLEventGestureRotateStart = @"Rotation"; __block NSArray *events; // Make an immutable copy - events = [_eventQueue copy]; - + events = [NSArray arrayWithArray:_eventQueue]; + // Update Queue to remove events sent to server [_eventQueue removeAllObjects];