Merge pull request #565 from Esri/Caleb/Fix-200.7Issues

[Fix] `200.7` warnings

Author: CalebRas

Shared/Samples/Configure clusters/ConfigureClustersView.swift

@@ -53,7 +53,6 @@ struct ConfigureClustersView: View {
                     isPresented: $showsPopup
                 ) { [popup] in
                     PopupView(popup: popup!, isPresented: $showsPopup)
-                        .showCloseButton(true)
                         .padding()
                 }
                 .toolbar {

Shared/Samples/Create KML multi-track/CreateKMLMultiTrackView.Model.swift

@@ -13,7 +13,8 @@
 // limitations under the License.
 
 import ArcGIS
-import SwiftUI
+import Combine
+import Foundation
 
 extension CreateKMLMultiTrackView {
     /// The view model for the sample.

Shared/Samples/Display clusters/DisplayClustersView.swift

@@ -85,7 +85,6 @@ struct DisplayClustersView: View {
                     isPresented: $showsPopup
                 ) { [popup] in
                     PopupView(popup: popup!, isPresented: $showsPopup)
-                        .showCloseButton(true)
                         .padding([.top, .horizontal])
 
                     if !geoElements.isEmpty {

Shared/Samples/Set up location-driven geotriggers/SetUpLocationDrivenGeotriggersView.swift

@@ -114,7 +114,6 @@ struct SetUpLocationDrivenGeotriggersView: View {
                 isPresented: $isShowingPopup
             ) {
                 PopupView(popup: model.popup!, isPresented: $isShowingPopup)
-                    .showCloseButton(true)
                     .padding()
             }
             .task(id: isShowingPopup) {

Shared/Samples/Show device location using indoor positioning/README.md

@@ -17,7 +17,7 @@ When there are no IPS beacons nearby or other errors occur while initializing th
 ## How it works
 
 1. Load an IPS-aware map. This can be a web map hosted as a portal item in ArcGIS Online, an Enterprise Portal, or a mobile map package (.mmpk) created with ArcGIS Pro.
-2. Create and load an `IndoorPositioningDefinition` (stored with the map), then create an `IndoorsLocationDataSource` from it. See the details about creating the location data source in the "[`Additional information`](#additional-information)" section below.
+2. Create and load an `IndoorPositioningDefinition` (stored with IPS-aware maps), then create an `IndoorsLocationDataSource` from it.
 3. Handle location change events to respond to floor changes or read other metadata for locations.
 4. Assign the `IndoorsLocationDataSource` to the map view's location display.
 5. Enable and disable the map view's location display using `start()` and `stop()`. Device location will appear on the display as a blue dot and update as the user moves throughout the space.
@@ -41,9 +41,6 @@ This sample uses an [IPS-aware web map](https://www.arcgis.com/home/item.html?id
 ## Additional information
 
 * Location and Bluetooth permissions are required for this sample.
-* You could initialize the `IndoorsLocationDataSource` from individual feature tables stored in different data sources, such as map, mobile geodatabase, and feature services. With version 200.5 and higher, you can construct the `IndoorsLocationDataSource` using a single `IndoorPositioningDefinition` available in your IPS-aware map. In short…
-    * If an `IndoorPositioningDefinition` is available in your IPS-aware map, use it to construct `IndoorsLocationDataSource`.
-    * If your map does not have an `IndoorPositioningDefinition`, construct the location data source from individual feature tables as described in [Manually create an indoor location data source](https://developers.arcgis.com/swift/device-location/indoor-positioning/#manually-create-an-indoor-location-data-source) documentation.
 * To learn more about IPS, read the [Indoor positioning](https://developers.arcgis.com/swift/device-location/indoor-positioning/) article on ArcGIS Developer website.
 * To learn more about how to deploy the indoor positioning system, read the [Deploy ArcGIS IPS](https://doc.arcgis.com/en/ips/latest/get-started/introduction-to-the-deployment-of-arcgis-ips.htm) article.
 

Shared/Samples/Show device location using indoor positioning/ShowDeviceLocationUsingIndoorPositioningView.Model.swift

@@ -19,7 +19,7 @@ import Foundation
 extension ShowDeviceLocationUsingIndoorPositioningView {
     @MainActor
     class Model: ObservableObject {
-        /// An IPS-aware and floor-aware web map for all three floors of 
+        /// An IPS-aware and floor-aware web map for all three floors of
         /// Esri Building L in Redlands.
         let map = Map(item: PortalItem(portal: .arcGISOnline(connection: .anonymous), id: .indoorsMap))
 
@@ -66,73 +66,21 @@ extension ShowDeviceLocationUsingIndoorPositioningView {
         }
 
         /// Sets the indoors location data source on the location display
-        /// depending on whether the map contains an indoor positioning definition.
+        /// using the map's indoor positioning definition.
         private func setUpIndoorsLocationDataSource() async throws {
-            let dataSource: IndoorsLocationDataSource
             if let indoorPositioningDefinition = map.indoorPositioningDefinition {
-                // If an indoor positioning definition exists in the map, uses it
-                // to set the IndoorsLocationDataSource. This is the recommended approach.
+                // Gets indoor positioning definition from the IPS-aware map
+                // and uses it to set the IndoorsLocationDataSource.
                 try await indoorPositioningDefinition.load()
-                dataSource = IndoorsLocationDataSource(definition: indoorPositioningDefinition)
-            } else if let positioningTable = map.tables.first(where: { $0.tableName == "ips_positioning" }) as? ServiceFeatureTable {
-                // Otherwise, creates the IndoorsLocationDataSource using
-                // IPS positioning table information. This is useful for
-                // manually creating an indoors location data source.
-                dataSource = try await makeIndoorsLocationDataSourceFromTables(map: map, positioningTable: positioningTable)
+                let dataSource = IndoorsLocationDataSource(definition: indoorPositioningDefinition)
+                locationDisplay.dataSource = dataSource
             } else {
                 throw SetupError()
             }
-            locationDisplay.dataSource = dataSource
             // Starts the location display.
             try await locationDisplay.dataSource.start()
         }
 
-        /// Creates an indoor location data source from the maps tables
-        /// when there is no indoors definition.
-        /// - Parameters:
-        ///   - map: The map which contains the data in accordance with
-        ///   the ArcGIS Indoors Information Model.
-        ///   - positioningTable: The “ips\_positioning” table from
-        ///   an IPS-aware map.
-        /// - Returns: Returns a configured `IndoorsLocationDataSource` created
-        /// from the various tables.
-        private func makeIndoorsLocationDataSourceFromTables(
-            map: Map,
-            positioningTable: ServiceFeatureTable
-        ) async throws -> IndoorsLocationDataSource {
-            let queryParameters = QueryParameters()
-            queryParameters.maxFeatures = 1
-            // Gets the specific version of data that is compatible to the schema.
-            // When use your own map, make sure the query returns the correct data.
-            queryParameters.whereClause = "OBJECTID=2"
-            // Queries a feature in the positioning table to get the positioning ID.
-            let queryResult = try await positioningTable.queryFeatures(using: queryParameters)
-            let feature = queryResult.features().makeIterator().next()!
-            // The ID that identifies a row in the positioning table.
-            // It is possible to initialize ILDS without globalID,
-            // in which case the first row of the positioning table
-            // will be used.
-            let positioningID = feature.attributes[positioningTable.globalIDField] as? UUID
-            // Gets the pathways table (optional for creating the IndoorsLocationDataSource).
-            // The network pathways for routing between locations on the same level.
-            let pathwaysTable = (
-                map.operationalLayers.first(where: { $0.name == "Pathways" }) as! FeatureLayer
-            ).featureTable as! ArcGISFeatureTable
-            // Gets the levels layer (optional for creating the IndoorsLocationDataSource).
-            // The table that contains floor levels.
-            let levelsTable = (
-                map.operationalLayers.first(where: { $0.name == "Levels" }) as! FeatureLayer
-            ).featureTable as! ArcGISFeatureTable
-            // Initialize an IndoorsLocationDataSource with positioning, pathways,
-            // levels tables, and positioning ID.
-            return IndoorsLocationDataSource(
-                positioningTable: positioningTable,
-                pathwaysTable: pathwaysTable,
-                levelsTable: levelsTable,
-                positioningID: positioningID
-            )
-        }
-        
         /// Updates the location when the location data source is triggered.
         func updateDisplayOnLocationChange() async {
             for await location in locationDisplay.dataSource.locations {

Shared/Samples/Show popup/ShowPopupView.swift

@@ -57,7 +57,6 @@ struct ShowPopupView: View {
                     isPresented: $showPopup
                 ) { [popup] in
                     PopupView(popup: popup!, isPresented: $showPopup)
-                        .showCloseButton(true)
                         .padding()
                 }
         }