Merge pull request #89 from Esri/update7

Update7

Author: mhdostal

Documentation/Bookmarks/README.md

@@ -0,0 +1,29 @@
+# Bookmarks
+
+The Bookmarks component will display a list of bookmarks in a table view and allows the user to select a bookmark and perform some action. 
+
+## Bookmarks Behavior:
+
+The `BookmarksTableViewController` can be created using either an `AGSGeoView` or an array of `AGSBookmark`s.
+
+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.
+
+## Usage
+
+```swift
+bookmarksVC = BookmarksViewController(geoView: mapView)
+bookmarksVC?.delegate = self
+
+...
+
+func bookmarksViewController(_ controller: BookmarksViewController, didSelect bookmark: AGSBookmark) {
+    if let viewpoint = bookmark.viewpoint {
+        mapView.setViewpoint(viewpoint, duration: 2.0)
+        dismiss(animated: true)
+    }
+}
+```
+
+To see it in action, try out the [Examples](../../Examples) and refer to [BookmarksExample.swift](../../Examples/ArcGISToolkitExamples/BookmarksExample.swift) in the project.

Examples/ArcGISToolkitExamples.xcodeproj/project.pbxproj

@@ -31,6 +31,7 @@
 		E47B17362304AB7D000C9C8B /* UserDirectionsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E47B17342304AB7D000C9C8B /* UserDirectionsView.swift */; };
 		E47B17372304AB7D000C9C8B /* CalibrationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E47B17352304AB7D000C9C8B /* CalibrationView.swift */; };
 		E48405751E9BE7E600927208 /* LegendExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = E48405741E9BE7E600927208 /* LegendExample.swift */; };
+		E48ADDBA23563E17005A53AF /* BookmarksExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = E48ADDB923563E17005A53AF /* BookmarksExample.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -55,6 +56,13 @@
 			remoteGlobalIDString = 8812336F1DF601A700B2EA8E;
 			remoteInfo = ArcGISToolkit;
 		};
+		E4CD706023A8436F000A3B1C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 88B6899F1E96E9AB00B67FAB /* ArcGISToolkit.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = E4685B03237CA3C400F168CF;
+			remoteInfo = ArcGISToolkitTests;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -97,6 +105,7 @@
 		E47B17342304AB7D000C9C8B /* UserDirectionsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserDirectionsView.swift; sourceTree = "<group>"; };
 		E47B17352304AB7D000C9C8B /* CalibrationView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CalibrationView.swift; sourceTree = "<group>"; };
 		E48405741E9BE7E600927208 /* LegendExample.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LegendExample.swift; sourceTree = "<group>"; };
+		E48ADDB923563E17005A53AF /* BookmarksExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksExample.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -150,6 +159,7 @@
 			isa = PBXGroup;
 			children = (
 				88B689A41E96E9AC00B67FAB /* ArcGISToolkit.framework */,
+				E4CD706123A8436F000A3B1C /* ArcGISToolkitTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -166,6 +176,7 @@
 				883EA74A20741A56006D6F72 /* PopupExample.swift */,
 				8800656D2228577A00F76945 /* TemplatePickerExample.swift */,
 				E447A12A2267BB9500578C0B /* ARExample.swift */,
+				E48ADDB923563E17005A53AF /* BookmarksExample.swift */,
 			);
 			name = Examples;
 			sourceTree = "<group>";
@@ -219,7 +230,7 @@
 				TargetAttributes = {
 					8839043A1DF6022A001F3188 = {
 						CreatedOnToolsVersion = 8.0;
-						LastSwiftMigration = 1010;
+						LastSwiftMigration = 1110;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
@@ -261,6 +272,13 @@
 			remoteRef = 88B689A31E96E9AC00B67FAB /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		E4CD706123A8436F000A3B1C /* ArcGISToolkitTests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = ArcGISToolkitTests.xctest;
+			remoteRef = E4CD706023A8436F000A3B1C /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -325,6 +343,7 @@
 				88DBC2A11FE83D6000255921 /* JobManagerExample.swift in Sources */,
 				88B689D11E96EDF400B67FAB /* VCListViewController.swift in Sources */,
 				E47B16FA22F8DECC000C9C8B /* ARStatusViewController.swift in Sources */,
+				E48ADDBA23563E17005A53AF /* BookmarksExample.swift in Sources */,
 				8800656E2228577A00F76945 /* TemplatePickerExample.swift in Sources */,
 				E47B17362304AB7D000C9C8B /* UserDirectionsView.swift in Sources */,
 				88B689CE1E96EDF400B67FAB /* ScalebarExample.swift in Sources */,
@@ -499,7 +518,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.esri.${PRODUCT_NAME}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -518,7 +537,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.esri.${PRODUCT_NAME}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

Examples/ArcGISToolkitExamples/ARExample.swift

@@ -554,6 +554,9 @@ extension ARExample {
                 let camera = AGSCamera(latitude: center.y, longitude: center.x, altitude: 0, heading: 0, pitch: 90.0, roll: 0)
                 self?.arView.originCamera = camera
                 self?.arView.translationFactor = 2000
+                
+                // Set the clipping distance to limit the data display around the originCamera.
+                self?.arView.clippingDistance = 750
             }
         }
 
@@ -601,6 +604,9 @@ extension ARExample {
                     let camera = AGSCamera(latitude: center.y, longitude: center.x, altitude: elevation, heading: 0, pitch: 90, roll: 0)
                     self?.arView.originCamera = camera
                     self?.arView.translationFactor = 18000
+                    
+                    // Reset the clipping distance so we view the full scene.
+                    self?.arView.clippingDistance = 0
                 }
             }
         }
@@ -649,6 +655,9 @@ extension ARExample {
                     let camera = AGSCamera(latitude: center.y, longitude: center.x, altitude: elevation, heading: 0, pitch: 90.0, roll: 0)
                     self?.arView.originCamera = camera
                     self?.arView.translationFactor = 1000
+
+                    // Set the clipping distance to limit the data display around the originCamera.
+                    self?.arView.clippingDistance = 500
                 }
             }
         }

Examples/ArcGISToolkitExamples/BookmarksExample.swift

@@ -0,0 +1,74 @@
+//
+// Copyright 2019 Esri.
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import UIKit
+import ArcGISToolkit
+import ArcGIS
+
+class BookmarksExample: MapViewController, BookmarksViewControllerDelegate {
+    var bookmarksVC: BookmarksViewController?
+    var bookmarksButton = UIBarButtonItem()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Add Bookmark button that will display the BookmarksTableViewController.
+        bookmarksButton = UIBarButtonItem(barButtonSystemItem: .bookmarks, target: self, action: #selector(showBookmarks))
+        navigationItem.rightBarButtonItem = bookmarksButton
+
+        // Create the map from a portal item and assign to the mapView.
+        let portal = AGSPortal.arcGISOnline(withLoginRequired: false)
+        let portalItem = AGSPortalItem(portal: portal, itemID: "16f1b8ba37b44dc3884afc8d5f454dd2")
+        mapView.map = AGSMap(item: portalItem)
+        
+        // Create the BookmarksTableViewController.
+        bookmarksVC = BookmarksViewController(geoView: mapView)
+        
+        // Add a cancel button.
+        let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancel))
+        bookmarksVC?.navigationItem.rightBarButtonItem = cancelButton
+        bookmarksVC?.delegate = self
+    }
+    
+    @objc
+    func showBookmarks() {
+        if let bookmarksVC = bookmarksVC {
+            // Display the bookmarksVC as a popover controller.
+            bookmarksVC.modalPresentationStyle = .popover
+            if let popoverPresentationController = bookmarksVC.popoverPresentationController {
+                popoverPresentationController.delegate = self
+                popoverPresentationController.barButtonItem = bookmarksButton
+            }
+            present(bookmarksVC, animated: true)
+        }
+    }
+    
+    @objc
+    func cancel() {
+        dismiss(animated: true)
+    }
+
+    func bookmarksViewController(_ controller: BookmarksViewController, didSelect bookmark: AGSBookmark) {
+        if let viewpoint = bookmark.viewpoint {
+            mapView.setViewpoint(viewpoint, duration: 2.0)
+            dismiss(animated: true)
+        }
+    }
+}
+
+extension BookmarksExample: UIPopoverPresentationControllerDelegate {
+    func presentationController(_ controller: UIPresentationController, viewControllerForAdaptivePresentationStyle style: UIModalPresentationStyle) -> UIViewController? {
+        return UINavigationController(rootViewController: controller.presentedViewController)
+    }
+}

Examples/ArcGISToolkitExamples/ExamplesViewController.swift

@@ -29,7 +29,8 @@ class ExamplesViewController: VCListViewController {
             ("Time Slider", TimeSliderExample.self, nil),
             ("Popup Controller", PopupExample.self, nil),
             ("Template Picker", TemplatePickerExample.self, nil),
-            ("AR", ARExample.self, nil)
+            ("AR", ARExample.self, nil),
+            ("Bookmarks", BookmarksExample.self, nil)
         ]
     }
 }

Examples/ArcGISToolkitExamples/JobManagerExample.swift

@@ -227,7 +227,7 @@ class JobManagerExample: TableViewController {
             }
 
             // remove task from array now that it's loaded
-            if let index = self.tasks.index(where: { return $0 === strongTask }) {
+            if let index = self.tasks.firstIndex(where: { return $0 === strongTask }) {
                 self.tasks.remove(at: index)
             }
 
@@ -343,6 +343,8 @@ extension AGSJobStatus {
             return "Succeeded"
         case .started:
             return "Started"
+        @unknown default:
+            fatalError("Unknown AGSJobStatus")
         }
     }
 }

Examples/ArcGISToolkitExamples/Misc/ARStatusViewController.swift

@@ -45,6 +45,8 @@ extension AGSLocationDataSourceStatus {
             return "Started"
         case .failedToStart:
             return "Failed to start"
+        @unknown default:
+            fatalError("Unknown AGSLocationDataSourceStatus")
         }
     }
 }

README.md

@@ -13,10 +13,11 @@ Toolkit components that will simplify your iOS app development with ArcGIS Runti
 * [PopupController](Documentation/PopupController)
 * [TemplatePickerViewController](Documentation/TemplatePicker)
 * [AR](Documentation/AR)
+* [Bookmarks](Documentation/Bookmarks)
 
 ## Requirements
-* [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/en/ios/) 100.6.0 (or higher)
-* Xcode 10.1 (or higher)
+* [ArcGIS Runtime SDK for iOS](https://developers.arcgis.com/en/ios/) 100.7.0 (or higher)
+* Xcode 10.2 (or higher)
 
 The *ArcGIS Runtime Toolkit for iOS* has a *Target SDK* version of *11.0*, meaning that it can run on devices with *iOS 11.0* or newer.
 
@@ -52,8 +53,7 @@ Note that you must also have the __ArcGIS Runtime SDK for iOS__ installed and yo
  5. Add `import ArcGISToolkit` in your source code and start using the toolkit components 
 
 ## SwiftLint
-New in the 100.6.0 release is SwiftLint support for both the Toolkit and Examples app.  You can install SwiftLint from [here](https://github.com/realm/SwiftLint).  It is not necessary to have it installed in order to build, but you will get a warning without it.  The specific rules the linter uses can be found in the `swiftlint.yml` files in the `Toolkit` and `Examples` directories.
-
+Both the Toolkit and Examples app support SwiftLint.  You can install SwiftLint from [here](https://github.com/realm/SwiftLint).  It is not necessary to have it installed in order to build, but you will get a warning without it.  The specific rules the linter uses can be found in the `swiftlint.yml` files in the `Toolkit` and `Examples` directories.
 
 ## Additional Resources