Reorder completion call

mapbox · Apr 23, 2021 · 1cba9c5 · 1cba9c5
1 parent b934bf9
commit 1cba9c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Sources/MapboxMaps/Foundation/BaseMapView.swift b/Sources/MapboxMaps/Foundation/BaseMapView.swift
@@ -155,7 +155,7 @@ open class BaseMapView: UIView {
                                                object: nil)
 
         if let validStyleURI = styleURI {
-            mapboxMap.__map.setStyleURIForUri(validStyleURI.path)
+            mapboxMap.__map.setStyleURIForUri(validStyleURI.absoluteString)
         }
     }
 

diff --git a/Sources/MapboxMaps/Foundation/Camera/CameraManager.swift b/Sources/MapboxMaps/Foundation/Camera/CameraManager.swift
@@ -191,8 +191,8 @@ public class CameraManager {
 
         // Add completion
         cameraAnimator.addCompletion({ [weak self] (position) in
-            completion?(position)
             self?.internalAnimator = nil
+            completion?(position)
         })
 
         // Start animation
@@ -235,8 +235,8 @@ public class CameraManager {
         // Nil out the internalAnimator after `flyTo` finishes
         flyToAnimator.addCompletion { [weak self](position) in
             // Call the developer-provided completion (if present)
-            completion?(position)
             self?.internalAnimator = nil
+            completion?(position)
         }
 
         flyToAnimator.startAnimation()
@@ -268,12 +268,9 @@ public class CameraManager {
         // Nil out the `internalAnimator` once the "ease to" finishes
         animator.addCompletion { [weak self] (_) in
             self?.internalAnimator = nil
-        }
-
-        // Add the developer-provided completion (if present)
-        if let completion = completion {
             animator.addCompletion(completion)
         }
+
         animator.startAnimation()
         internalAnimator = animator