Merge pull request #171 from Esri/mhd/Fix_Warnings

Fix warnings with SDK release candidate.
Esri · Apr 25, 2022 · 10dfc98 · 10dfc98
2 parents fcba186 + 6ed3186
commit 10dfc98
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/Examples/ArcGISToolkitExamples/ARExample.swift b/Examples/ArcGISToolkitExamples/ARExample.swift
@@ -35,7 +35,7 @@ class ARExample: UIViewController {
     private let arView = ArcGISARView(renderVideoFeed: true)
 
     /// Denotes whether we've placed the scene in table top experiences.
-    private var didPlaceScene: Bool = false
+    private var didPlaceScene = false
 
     // View controller displaying current status of `ARExample`.
     private let statusViewController: ARStatusViewController? = {
@@ -67,10 +67,10 @@ class ARExample: UIViewController {
     private var toolbar = UIToolbar(frame: .zero)
 
     /// Button used to display the `CalibrationView`.
-    private let calibrationItem = UIBarButtonItem(title: "Calibration", style: .plain, target: self, action: #selector(displayCalibration(_:)))
+    private let calibrationItem = UIBarButtonItem(title: "Calibration", style: .plain, target: ARExample.self, action: #selector(displayCalibration(_:)))
 
     /// Button used to change the current scene.
-    private let sceneItem = UIBarButtonItem(title: "Change Scene", style: .plain, target: self, action: #selector(changeScene(_:)))
+    private let sceneItem = UIBarButtonItem(title: "Change Scene", style: .plain, target: ARExample.self, action: #selector(changeScene(_:)))
 
     // MARK: Initialization
 

diff --git a/Examples/ArcGISToolkitExamples/JobManagerExample.swift b/Examples/ArcGISToolkitExamples/JobManagerExample.swift
@@ -405,6 +405,8 @@ extension AGSJobStatus {
             return "Succeeded"
         case .started:
             return "Started"
+        case .canceling:
+            return "Canceling"
         @unknown default:
             fatalError("Unknown AGSJobStatus")
         }

diff --git a/Examples/ArcGISToolkitExamples/Misc/ARStatusViewController.swift b/Examples/ArcGISToolkitExamples/Misc/ARStatusViewController.swift
@@ -45,6 +45,8 @@ extension AGSLocationDataSourceStatus {
             return "Started"
         case .failedToStart:
             return "Failed to start"
+        case .stopping:
+            return "Stopping"
         @unknown default:
             fatalError("Unknown AGSLocationDataSourceStatus")
         }

diff --git a/Examples/ArcGISToolkitExamples/Misc/CalibrationView.swift b/Examples/ArcGISToolkitExamples/Misc/CalibrationView.swift
@@ -19,7 +19,7 @@ import ArcGISToolkit
 /// A view displaying controls for adjusting a scene view's location, heading, and elevation. Used to calibrate an AR session.
 class CalibrationView: UIView {
     /// Denotes whether to show the elevation control and label; defaults to `true`.
-    var elevationControlVisibility: Bool = true {
+    var elevationControlVisibility = true {
         didSet {
             elevationSlider.isHidden = !elevationControlVisibility
             elevationLabel.isHidden = !elevationControlVisibility

diff --git a/Sources/ArcGISToolkit/AR/ArcGISARView.swift b/Sources/ArcGISToolkit/AR/ArcGISARView.swift
@@ -290,8 +290,9 @@ public class ArcGISARView: UIView {
     /// - Since: 100.6.0
     public func stopTracking() {
         arSCNView.session.pause()
-        locationDataSource?.stop()
-        isTracking = false
+        locationDataSource?.stop { [weak self] in
+            self?.isTracking = false
+        }
     }
 
     // MARK: Private
@@ -528,7 +529,7 @@ extension ArcGISARView: AGSLocationChangeHandlerDelegate {
 
         if locationTrackingMode != .continuous {
             // Stop the data source if the tracking mode is not continuous.
-            locationDataSource.stop()
+            locationDataSource.stop(completion: nil)
         }
 
         locationChangeHandlerDelegate?.locationDataSource?(locationDataSource, locationDidChange: location)