Merge pull request #182 from Esri/v.next

Merge v.next into main for v100.15

Author: mhdostal

Documentation/Bookmarks/README.md

@@ -8,7 +8,7 @@ The `BookmarksTableViewController` can be created using either an `AGSGeoView` o
 
 Clients must set the `delegate` property and implement the `bookmarksViewController:didSelect` delegate method in order to be notified when a bookmark is selected.
 
-The `BookmarksTableViewController` observes changes to the `map` or `scene` property on the `AGSGeoView` and also the map or scene's `bookmarks` property and will udpate the list of bookmarks accordingly.
+The `BookmarksTableViewController` observes changes to the `map` or `scene` property on the `AGSGeoView` and also the map or scene's `bookmarks` property and will update the list of bookmarks accordingly.
 
 ## Usage
 

Documentation/Compass/README.md

@@ -13,13 +13,8 @@ When the compass is tapped, the map orients back to north (zero bearing), the de
 ### Usage
 
 ```swift
-
-        let compass = Compass(mapView: mapView)
-        self.view.addSubview(compass)
+let compass = Compass(mapView: mapView)
+self.view.addSubview(compass)
 ```
 
 To see it in action, try out the [Examples](../../Examples) and refer to [CompassExample.swift](../../Examples/ArcGISToolkitExamples/CompassExample.swift) in the project.
-
-
-
-

Documentation/JobManager/README.md

@@ -7,35 +7,34 @@ The Job Manager is a toolkit component that you can just plug into the applicati
 ### Usage
 
 ```swift
-
-	// create and load a task
-        let task = AGSGeodatabaseSyncTask(url: URL)
-	task.load{ error in
-
-            // make sure we are still around...
-            guard let strongSelf = self else {
-                return
-            }
-
-	    // make sure task does not get released
-            guard let strongTask = task else{
-                return
-            }
-
-	    // set up params
-            let params = AGSGenerateGeodatabaseParameters()
-	    // <param setup here>
-
-	    // generate job
-            let job = strongTask.generateJob(with: params, downloadFileURL: downloadURL)
-
-            // register the job with our JobManager shared instance
-            JobManager.shared.register(job: job)
-            
-            // start the job
-            job.start(statusHandler: strongSelf.jobStatusHandler, completion: strongSelf.jobCompletionHandler)
-
-	}		
+// create and load a task
+let task = AGSGeodatabaseSyncTask(url: URL)
+task.load { error in
+    
+    // make sure we are still around...
+    guard let strongSelf = self else {
+        return
+    }
+    
+    // make sure task does not get released
+    guard let strongTask = task else {
+        return
+    }
+    
+    // set up params
+    let params = AGSGenerateGeodatabaseParameters()
+    // <param setup here>
+    
+    // generate job
+    let job = strongTask.generateJob(with: params, downloadFileURL: downloadURL)
+    
+    // register the job with our JobManager shared instance
+    JobManager.shared.register(job: job)
+    
+    // start the job
+    job.start(statusHandler: strongSelf.jobStatusHandler, completion: strongSelf.jobCompletionHandler)
+    
+}
 ```
 
 To see it in action, try out the [Examples](../../Examples) and refer to [JobManagerExample.swift](../../Examples/ArcGISToolkitExamples/JobManagerExample.swift) in the project.

Documentation/LegendViewController/README.md

@@ -1,20 +1,12 @@
 # Legend View Controller
 
 A Legend View Controller displays a legend for a set of layers in a Map or Scene contained in a MapView or SceneView. A legend conveys the meaning of the symbols used to represent features in the layer. For each layer, the legend contains a patch displaying the symbology used along with some explanatory text. The Legend View Controller is dynamic and only contains information about visible layers. As layers go in and out of scale range, or are turned on/off, the legend updates to include only those layers that are visible to the user in the MapView or SceneView.
- 
-
 
 ### Usage
 
 ```swift
-
-	let legendVC = LegendViewController.makeLegendViewController(geoView: mapView)
-	self.present(legendVC,  animated:true, completion:nil)
-		
+let legendVC = LegendViewController.makeLegendViewController(geoView: mapView)
+self.present(legendVC,  animated:true, completion:nil)	
 ```
 
 To see it in action, try out the [Examples](../../Examples) and refer to [LegendExample.swift](../../Examples/ArcGISToolkitExamples/LegendExample.swift) in the project.
-
-
-
-

Documentation/MeasureToolbar/README.md

@@ -5,9 +5,8 @@ The MeasureToolbar provides an all-in-one toolbar that you can add to your appli
 ### Usage
 
 ```swift
-    let measureToolbar = MeasureToolbar(mapView: mapView)
-    view.addSubview(measureToolbar)
+let measureToolbar = MeasureToolbar(mapView: mapView)
+view.addSubview(measureToolbar)
 ```
 
 To see it in action, try out the [Examples](../../Examples) and refer to [MeasureExample.swift](../../Examples/ArcGISToolkitExamples/MeasureExample.swift) in the project.
-

Documentation/Scalebar/README.md

@@ -7,11 +7,11 @@ The scalebar uses geodetic calculations to provide accurate measurements for map
 ### Usage
 
 ```swift
-        let scalebar = Scalebar(mapView: mapView)
-        scalebar.style = .alternatingBar
-        scalebar.units = .metric
-        scalebar.alignment = .left
-        view.addSubview(scalebar)
+let scalebar = Scalebar(mapView: mapView)
+scalebar.style = .alternatingBar
+scalebar.units = .metric
+scalebar.alignment = .left
+view.addSubview(scalebar)
 ```
 
 To see it in action, try out the [Examples](../../Examples) and refer to [ScalebarExample.swift](../../Examples/ArcGISToolkitExamples/ScalebarExample.swift) in the project.

Documentation/TimeSlider/README.md

@@ -56,33 +56,27 @@ User can control whether to show `Slider` and/or `Playback Buttons` using `isSli
 Initialize TimeSlider and add constraints to position it.
 
 ```swift
-    // Configure time slider
-    let timeSlider = TimeSlider()
-    timeSlider.labelMode = .ticks
-    timeSlider.addTarget(self, action: #selector(TimeSliderExample.timeSliderValueChanged(timeSlider:)), for: .valueChanged)
-    view.addSubview(timeSlider)
-
-    // Add constraints to position the slider
-    let margin: CGFloat = 10.0
-    timeSlider.translatesAutoresizingMaskIntoConstraints = false
-    timeSlider.bottomAnchor.constraint(equalTo: mapView.attributionTopAnchor, constant: -margin).isActive = true
-
-    if #available(iOS 11.0, *) {
-        timeSlider.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: margin).isActive = true
-        timeSlider.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -margin).isActive = true
-    }
-    else {
-        timeSlider.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: margin).isActive = true
-        timeSlider.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -margin).isActive = true
-    }
+// Configure time slider
+let timeSlider = TimeSlider()
+timeSlider.labelMode = .ticks
+timeSlider.addTarget(self, action: #selector(TimeSliderExample.timeSliderValueChanged(timeSlider:)), for: .valueChanged)
+view.addSubview(timeSlider)
+
+// Add constraints to position the slider
+let margin: CGFloat = 10.0
+timeSlider.translatesAutoresizingMaskIntoConstraints = false
+timeSlider.bottomAnchor.constraint(equalTo: mapView.attributionTopAnchor, constant: -margin).isActive = true
+
+timeSlider.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor, constant: margin).isActive = true
+timeSlider.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor, constant: -margin).isActive = true
 ```
 
 Use one of three initialize helper function to setup properties of the Time Slider.
 
 ```swift
-    public func initializeTimeProperties(geoView: AGSGeoView, observeGeoView: Bool, completion: @escaping (Error?)->Void)
-    public func initializeTimeProperties(timeAwareLayer: AGSTimeAware, completion: @escaping (Error?)->Void)
-    public func initializeTimeSteps(timeStepCount: Int, fullExtent: AGSTimeExtent, completion: @escaping (Error?)->Void)
+public func initializeTimeProperties(geoView: AGSGeoView, observeGeoView: Bool, completion: @escaping (Error?)->Void)
+public func initializeTimeProperties(timeAwareLayer: AGSTimeAware, completion: @escaping (Error?)->Void)
+public func initializeTimeSteps(timeStepCount: Int, fullExtent: AGSTimeExtent, completion: @escaping (Error?)->Void)
 ```
 
 To see it in action, try out the [Examples](../../Examples) and refer to [TimeSliderExample.swift](../../Examples/ArcGISToolkitExamples/TimeSliderExample.swift) in the project.
@@ -122,5 +116,3 @@ You can customize many visual elements of the TimeSlider such as -
 * `layerExtentFillColor`
 * `trackHeight`
 * `theme`
-
-

Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj

@@ -333,7 +333,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -388,7 +388,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -405,7 +405,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = ArcGISToolkitExamples/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -426,7 +426,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = ArcGISToolkitExamples/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

Examples/ArcGISToolkitExamples/ARExample.swift

@@ -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: ARExample.self, action: #selector(displayCalibration(_:)))
+    private let calibrationItem = UIBarButtonItem(title: "Calibration", style: .plain, target: nil, action: #selector(displayCalibration(_:)))
 
     /// Button used to change the current scene.
-    private let sceneItem = UIBarButtonItem(title: "Change Scene", style: .plain, target: ARExample.self, action: #selector(changeScene(_:)))
+    private let sceneItem = UIBarButtonItem(title: "Change Scene", style: .plain, target: nil, action: #selector(changeScene(_:)))
 
     // MARK: Initialization
 
@@ -86,7 +86,7 @@ class ARExample: UIViewController {
         // Set ourself as location change delegate so we can get location data source events.
         arView.locationChangeHandlerDelegate = self
 
-        // Disble user interactions on the sceneView.
+        // Disable user interactions on the sceneView.
         arView.sceneView.interactionOptions.isEnabled = false
 
         // Set ourself as the ARKit session delegate.
@@ -252,7 +252,7 @@ class ARExample: UIViewController {
         present(alertController, animated: true)
     }
 
-    /// Dislays the status view controller.
+    /// Displays the status view controller.
     ///
     /// - Parameter sender: The bar button item tapped on.
     @objc
@@ -406,7 +406,7 @@ extension ARExample: AGSGeoViewTouchDelegate {
             // We're in full-scale AR mode or have already placed the scene. Get the real world location for screen point from arView.
             guard let point = arView.arScreenToLocation(screenPoint: screenPoint) else { return }
 
-            // Create and place a graphic and shadown at the real world location.
+            // Create and place a graphic and shadow at the real world location.
             let shadowColor = UIColor.lightGray.withAlphaComponent(0.5)
             let shadow = AGSSimpleMarkerSceneSymbol(style: .sphere, color: shadowColor, height: 0.01, width: 0.25, depth: 0.25, anchorPosition: .center)
             let shadowGraphic = AGSGraphic(geometry: point, symbol: shadow)
@@ -455,7 +455,7 @@ extension ARExample {
             case .excessiveMotion:
                 message = "Try moving your device more slowly."
             case .initializing:
-                // Because ARKit gets reset often when using continuous GPS, only dipslay initializing message if we're not in continuous tracking mode.
+                // Because ARKit gets reset often when using continuous GPS, only display initializing message if we're not in continuous tracking mode.
                 if let sceneInfo = currentSceneInfo, sceneInfo.trackingMode != .continuous {
                     message = "Keep moving your device."
                 } else {
@@ -497,7 +497,7 @@ extension ARExample {
 // MARK: Scene creation methods
 extension ARExample {
     //
-    // These methods create the scenes and perform other intitialization required to set up the AR experiences.
+    // These methods create the scenes and perform other initialization required to set up the AR experiences.
     //
 
     /// Creates a scene based on the Streets base map.

Examples/ArcGISToolkitExamples/Misc/CalibrationView.swift

@@ -129,9 +129,9 @@ class CalibrationView: UIView {
         ])
 
         // Setup actions for the two sliders. The sliders operate as "joysticks", where moving the slider thumb will start a timer
-        // which roates or elevates the current camera when the timer fires.  The elevation and heading delta
+        // which rotates or elevates the current camera when the timer fires. The elevation and heading delta
         // values increase the further you move away from center.  Moving and holding the thumb a little bit from center
-        // will roate/elevate just a little bit, but get progressively more the further from center the thumb is moved.
+        // will rotate/elevate just a little bit, but get progressively more the further from center the thumb is moved.
         headingSlider.addTarget(self, action: #selector(headingChanged(_:)), for: .valueChanged)
         headingSlider.addTarget(self, action: #selector(touchUpHeading(_:)), for: [.touchUpInside, .touchUpOutside])