From 7bb48d266ccd45f162512bb14d293dd5f78d1c58 Mon Sep 17 00:00:00 2001
From: Scott Goodson <scottgoodson@gmail.com>
Date: Fri, 18 Mar 2016 23:30:26 -0700
Subject: [PATCH] [ASMapNode] Reduce number of MapKit calls to -cancel by using
 the .isLoading property.

---
 AsyncDisplayKit/ASMapNode.mm | 40 +++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/AsyncDisplayKit/ASMapNode.mm b/AsyncDisplayKit/ASMapNode.mm
index b714255e00..ae3d680139 100644
--- a/AsyncDisplayKit/ASMapNode.mm
+++ b/AsyncDisplayKit/ASMapNode.mm
@@ -134,12 +134,14 @@
 - (void)setOptions:(MKMapSnapshotOptions *)options
 {
   ASDN::MutexLocker l(_propertyLock);
-  _options = options;
-  if (self.isLiveMap) {
-    [self applySnapshotOptions];
-  } else {
-    [self resetSnapshotter];
-    [self takeSnapshot];
+  if (!_options || ![options isEqual:_options]) {
+    _options = options;
+    if (self.isLiveMap) {
+      [self applySnapshotOptions];
+    } else if (_snapshotter) {
+      [self destroySnapshotter];
+      [self takeSnapshot];
+    }
   }
 }
 
@@ -160,7 +162,11 @@
   if (!_snapshotter) {
     [self setUpSnapshotter];
   }
-  [_snapshotter cancel];
+  
+  if (_snapshotter.isLoading) {
+    return;
+  }
+
   [_snapshotter startWithQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)
              completionHandler:^(MKMapSnapshot *snapshot, NSError *error) {
                 if (!error) {
@@ -207,12 +213,10 @@
   _snapshotter = [[MKMapSnapshotter alloc] initWithOptions:self.options];
 }
 
-- (void)resetSnapshotter
+- (void)destroySnapshotter
 {
-  // FIXME: The semantics of this method / name would suggest that we cancel + destroy the snapshotter,
-  // but not that we create a new one.  We should probably only create the new one in -takeSnapshot or something.
   [_snapshotter cancel];
-  _snapshotter = [[MKMapSnapshotter alloc] initWithOptions:self.options];
+  _snapshotter = nil;
 }
 
 - (void)applySnapshotOptions
@@ -273,11 +277,14 @@
 }
 
 #pragma mark - Layout
-- (void)setSnapshotSizeIfNeeded:(CGSize)snapshotSize
+- (void)setSnapshotSizeWithReloadIfNeeded:(CGSize)snapshotSize
 {
   if (!CGSizeEqualToSize(self.options.size, snapshotSize)) {
     _options.size = snapshotSize;
-    [self resetSnapshotter];
+    if (_snapshotter) {
+      [self destroySnapshotter];
+      [self takeSnapshot];
+    }
   }
 }
 
@@ -287,11 +294,11 @@
   if (CGSizeEqualToSize(size, CGSizeZero)) {
     size = constrainedSize;
   }
-  [self setSnapshotSizeIfNeeded:size];
+  [self setSnapshotSizeWithReloadIfNeeded:size];
   return constrainedSize;
 }
 
-// Layout isn't usually needed in the box model, but since we are making use of MKMapView this is preferred.
+// -layout isn't usually needed over -layoutSpecThatFits, but this way we can avoid a needless node wrapper for MKMapView.
 - (void)layout
 {
   [super layout];
@@ -300,10 +307,9 @@
   } else {
     // If our bounds.size is different from our current snapshot size, then let's request a new image from MKMapSnapshotter.
     if (_needsMapReloadOnBoundsChange) {
-      [self setSnapshotSizeIfNeeded:self.bounds.size];
+      [self setSnapshotSizeWithReloadIfNeeded:self.bounds.size];
       // FIXME: Adding a check for FetchData here seems to cause intermittent map load failures, but shouldn't.
       // if (ASInterfaceStateIncludesFetchData(self.interfaceState)) {
-      [self takeSnapshot];
     }
   }
 }