Merge branch 'v.next' into Caleb/Update-SampleViewerSearchBar

yo1995 · yo1995 · commit 62e0b9698932 · 2023-08-11T14:47:41.000-07:00
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -28,7 +28,6 @@ disabled_rules:
 
 # Some rules are only opt-in
 opt_in_rules: 
-  - anyobject_protocol
   - array_init
   - attributes
   - closure_end_indentation
@@ -74,6 +73,8 @@ opt_in_rules:
   - vertical_whitespace_opening_braces
   - yoda_condition
 
+attributes:
+  attributes_with_arguments_always_on_line_above: false
 identifier_name:
   min_length:
     # Do not flag short identifiers
diff --git a/Samples.xcodeproj/project.pbxproj b/Samples.xcodeproj/project.pbxproj
@@ -88,6 +88,8 @@
 		1C43BC852A43783900509BF8 /* SetVisibilityOfSubtypeSublayerView.Model.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 1C43BC7C2A43781100509BF8 /* SetVisibilityOfSubtypeSublayerView.Model.swift */; };
 		1C43BC862A43783900509BF8 /* SetVisibilityOfSubtypeSublayerView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 1C43BC7E2A43781100509BF8 /* SetVisibilityOfSubtypeSublayerView.swift */; };
 		1C43BC872A43783900509BF8 /* SetVisibilityOfSubtypeSublayerView.Views.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 1C43BC792A43781100509BF8 /* SetVisibilityOfSubtypeSublayerView.Views.swift */; };
+		1C56B5E62A82C02D000381DA /* DisplayPointsUsingClusteringFeatureReductionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C56B5E22A82C02D000381DA /* DisplayPointsUsingClusteringFeatureReductionView.swift */; };
+		1C56B5E72A82C057000381DA /* DisplayPointsUsingClusteringFeatureReductionView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 1C56B5E22A82C02D000381DA /* DisplayPointsUsingClusteringFeatureReductionView.swift */; };
 		1C929F092A27B86800134252 /* ShowUtilityAssociationsView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 1CAF831B2A20305F000E1E60 /* ShowUtilityAssociationsView.swift */; };
 		1C965C3929DB9176002F8536 /* ShowRealisticLightAndShadowsView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 1C9B74C529DB43580038B06F /* ShowRealisticLightAndShadowsView.swift */; };
 		1C9B74C929DB43580038B06F /* ShowRealisticLightAndShadowsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1C9B74C529DB43580038B06F /* ShowRealisticLightAndShadowsView.swift */; };
@@ -275,6 +277,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
+				1C56B5E72A82C057000381DA /* DisplayPointsUsingClusteringFeatureReductionView.swift in Copy Source Code Files */,
 				D7ABA3002A3288970021822B /* ShowViewshedFromGeoelementInSceneView.swift in Copy Source Code Files */,
 				1C3B7DCD2A5F652500907443 /* AnalyzeNetworkWithSubnetworkTraceView.Model.swift in Copy Source Code Files */,
 				1C3B7DCE2A5F652500907443 /* AnalyzeNetworkWithSubnetworkTraceView.swift in Copy Source Code Files */,
@@ -421,6 +424,7 @@
 		1C43BC792A43781100509BF8 /* SetVisibilityOfSubtypeSublayerView.Views.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetVisibilityOfSubtypeSublayerView.Views.swift; sourceTree = "<group>"; };
 		1C43BC7C2A43781100509BF8 /* SetVisibilityOfSubtypeSublayerView.Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetVisibilityOfSubtypeSublayerView.Model.swift; sourceTree = "<group>"; };
 		1C43BC7E2A43781100509BF8 /* SetVisibilityOfSubtypeSublayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetVisibilityOfSubtypeSublayerView.swift; sourceTree = "<group>"; };
+		1C56B5E22A82C02D000381DA /* DisplayPointsUsingClusteringFeatureReductionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DisplayPointsUsingClusteringFeatureReductionView.swift; sourceTree = "<group>"; };
 		1C9B74C529DB43580038B06F /* ShowRealisticLightAndShadowsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShowRealisticLightAndShadowsView.swift; sourceTree = "<group>"; };
 		1C9B74D529DB54560038B06F /* ChangeCameraControllerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangeCameraControllerView.swift; sourceTree = "<group>"; };
 		1CAB8D442A3CEAB0002AA649 /* RunValveIsolationTraceView.Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RunValveIsolationTraceView.Model.swift; sourceTree = "<group>"; };
@@ -616,6 +620,7 @@
 				F111CCBD288B548400205358 /* Display map from mobile map package */,
 				D752D95B2A3BCDD4003EB25E /* Display map from portal item */,
 				00B04FB3283EEB830026C882 /* Display overview map */,
+				1C56B5DE2A82C02D000381DA /* Display points using clustering feature reduction */,
 				E004A6D528465C70002A1FE6 /* Display scene */,
 				E070A0A1286F3B3400F2B606 /* Download preplanned map area */,
 				E004A6EE284E4B7A002A1FE6 /* Download vector tiles to local cache */,
@@ -872,6 +877,14 @@
 			path = "Set visibility of subtype sublayer";
 			sourceTree = "<group>";
 		};
+		1C56B5DE2A82C02D000381DA /* Display points using clustering feature reduction */ = {
+			isa = PBXGroup;
+			children = (
+				1C56B5E22A82C02D000381DA /* DisplayPointsUsingClusteringFeatureReductionView.swift */,
+			);
+			path = "Display points using clustering feature reduction";
+			sourceTree = "<group>";
+		};
 		1C965C4629DBA879002F8536 /* 681d6f7694644709a7c830ec57a2d72b */ = {
 			isa = PBXGroup;
 			children = (
@@ -1613,6 +1626,7 @@
 				E004A6C128414332002A1FE6 /* SetViewpointRotationView.swift in Sources */,
 				883C121529C9136600062FF9 /* DownloadPreplannedMapAreaView.MapPicker.swift in Sources */,
 				1C9B74C929DB43580038B06F /* ShowRealisticLightAndShadowsView.swift in Sources */,
+				1C56B5E62A82C02D000381DA /* DisplayPointsUsingClusteringFeatureReductionView.swift in Sources */,
 				00E5401E27F3CCA200CF66D5 /* ContentView.swift in Sources */,
 				D7634FAF2A43B7AC00F8AEFB /* CreateConvexHullAroundGeometriesView.swift in Sources */,
 				E066DD382860AB28004D3D5B /* StyleGraphicsWithRendererView.swift in Sources */,
diff --git a/Shared/Samples/Add dynamic entity layer/AddDynamicEntityLayerView.swift b/Shared/Samples/Add dynamic entity layer/AddDynamicEntityLayerView.swift
@@ -41,7 +41,7 @@ struct AddDynamicEntityLayerView: View {
                     Button(isConnected ? "Disconnect" : "Connect") {
                         Task {
                             if isConnected {
-                                try? await model.streamService.disconnect()
+                                await model.streamService.disconnect()
                             } else {
                                 try? await model.streamService.connect()
                             }
diff --git a/Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.Model.swift b/Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.Model.swift
@@ -347,6 +347,8 @@ extension AnalyzeNetworkWithSubnetworkTraceView {
                 return value as! Double
             case .boolean:
                 return value as! Bool
+            @unknown default:
+                fatalError("Unexpected utility network attribute data type.")
             }
         }
     }
diff --git a/Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.swift b/Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.swift
@@ -116,6 +116,7 @@ struct AnalyzeNetworkWithSubnetworkTraceView: View {
         Spacer()
         Button {
             isConditionMenuPresented = true
+            inputValue = nil
         } label: {
             Image(systemName: "plus")
                 .imageScale(.large)
@@ -254,8 +255,8 @@ struct AnalyzeNetworkWithSubnetworkTraceView: View {
         List(model.possibleAttributes, id: \.name) { attribute in
             HStack {
                 Text(attribute.name)
+                Spacer()
                 if attribute === selectedAttribute {
-                    Spacer()
                     Image(systemName: "checkmark")
                         .foregroundColor(.accentColor)
                 }
@@ -273,8 +274,8 @@ struct AnalyzeNetworkWithSubnetworkTraceView: View {
             List(UtilityNetworkAttributeComparison.Operator.allCases, id: \.self) { comparison in
                 HStack {
                     Text(comparison.title)
+                    Spacer()
                     if comparison == selectedComparison {
-                        Spacer()
                         Image(systemName: "checkmark")
                             .foregroundColor(.accentColor)
                     }
@@ -294,8 +295,8 @@ struct AnalyzeNetworkWithSubnetworkTraceView: View {
                 List(domain.codedValues, id: \.name) { value in
                     HStack {
                         Text(value.name)
+                        Spacer()
                         if value === selectedValue as? CodedValue {
-                            Spacer()
                             Image(systemName: "checkmark")
                                 .foregroundColor(.accentColor)
                         }
diff --git a/Shared/Samples/Display points using clustering feature reduction/DisplayPointsUsingClusteringFeatureReductionView.swift b/Shared/Samples/Display points using clustering feature reduction/DisplayPointsUsingClusteringFeatureReductionView.swift
@@ -0,0 +1,107 @@
+// Copyright 2023 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
+//
+//   https://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 ArcGIS
+import SwiftUI
+import ArcGISToolkit
+
+struct DisplayPointsUsingClusteringFeatureReductionView: View {
+    /// A map of global power plants.
+    @State private var map = {
+        let portalItem = PortalItem(
+            portal: .arcGISOnline(connection: .anonymous),
+            id: PortalItem.ID("8916d50c44c746c1aafae001552bad23")!
+        )
+        return Map(item: portalItem)
+    }()
+    
+    /// The power plants feature layer for querying.
+    private var layer: FeatureLayer? {
+        map.operationalLayers.first as? FeatureLayer
+    }
+    
+    /// The screen point to perform an identify operation.
+    @State private var identifyScreenPoint: CGPoint?
+    
+    /// The popup to be shown as the result of the layer identify operation.
+    @State private var popup: Popup?
+    
+    /// A Boolean value specifying whether the popup view should be shown or not.
+    @State private var showsPopup = false
+    
+    /// A Boolean value specifying whether the layer's feature reduction is shown.
+    @State private var showsFeatureReduction = true
+    
+    /// A Boolean value indicating whether to show an error alert.
+    @State private var isShowingAlert = false
+    
+    /// The error shown in the error alert.
+    @State var error: Error? {
+        didSet { isShowingAlert = error != nil }
+    }
+    
+    var body: some View {
+        MapViewReader { proxy in
+            MapView(map: map)
+                .onSingleTapGesture { screenPoint, _ in
+                    identifyScreenPoint = screenPoint
+                }
+                .task(id: identifyScreenPoint) {
+                    guard let identifyScreenPoint,
+                          let layer,
+                          let identifyResult = try? await proxy.identify(
+                            on: layer,
+                            screenPoint: identifyScreenPoint,
+                            tolerance: 3
+                          ),
+                          let firstPopup = identifyResult.popups.first
+                    else { return }
+                    self.popup = firstPopup
+                    self.showsPopup = true
+                }
+                .floatingPanel(
+                    selectedDetent: .constant(.half),
+                    horizontalAlignment: .leading,
+                    isPresented: $showsPopup
+                ) {
+                    Group {
+                        if let popup = popup {
+                            PopupView(popup: popup, isPresented: $showsPopup)
+                                .showCloseButton(true)
+                        }
+                    }
+                    .padding()
+                }
+                .toolbar {
+                    ToolbarItem(placement: .bottomBar) {
+                        Toggle("Feature clustering", isOn: $showsFeatureReduction)
+                            .toggleStyle(.switch)
+                            .onChange(of: showsFeatureReduction) { isEnabled in
+                                layer?.featureReduction?.isEnabled = isEnabled
+                            }
+                    }
+                }
+                .task {
+                    do {
+                        try await map.load()
+                        await proxy.setViewpointScale(1e7)
+                        layer?.featureReduction?.isEnabled = true
+                    } catch {
+                        self.error = error
+                    }
+                }
+                .alert(isPresented: $isShowingAlert, presentingError: error)
+        }
+    }
+}
diff --git a/Shared/Samples/Display points using clustering feature reduction/README.md b/Shared/Samples/Display points using clustering feature reduction/README.md
@@ -0,0 +1,39 @@
+# Display points using clustering feature reduction
+
+Display a web map with a point feature layer that has feature reduction enabled to aggregate points into clusters.
+
+![Image of display points using clustering feature reduction sample](display-points-using-clustering-feature-reduction.png)
+
+## Use case
+
+Feature clustering can be used to dynamically aggregate groups of points that are within proximity of each other in order to represent each group with a single symbol. Such grouping allows you to see patterns in the data that are difficult to visualize when a layer contains hundreds or thousands of points that overlap and cover each other.
+
+## How to use the sample
+
+Pan and zoom the map to view how clustering is dynamically updated. Toggle clustering off to view the original point features that make up the clustered elements. When clustering is toggled on, you can tap on a clustered geoelement to view aggregated information and summary statistics for that cluster. When clustering is toggled off and you tap on the original feature you get access to information about individual power plant features.
+
+## How it works
+
+1. Create a map from a web map `PortalItem`.
+2. Get the cluster enabled layer from the map's operational layers.
+3. Get the `FeatureReduction` from the feature layer and set `isEnabled` to enable or disable clustering on the feature layer.
+4. Use the `onSingleTapGesture` modifier to listen for tap events on the map view.
+5. Identify tapped features on the map using `identify(on:screenPoint:tolerance:returnPopupsOnly:maximumResults:)` on the feature layer and pass in the map screen point location.
+6. Get the `Popup` from the resulting `IdentifyLayerResult` and use it to construct a `PopupView`.
+7. Use a `FloatingPanel` to display the popup information from the `PopupView`.
+
+## Relevant API
+
+* AggregateGeoElement
+* FeatureLayer
+* FeatureReduction
+* GeoElement
+* IdentifyLayerResult
+
+## About the data
+
+This sample uses a [web map](https://www.arcgis.com/home/item.html?id=8916d50c44c746c1aafae001552bad23) that displays the [Esri Global Power Plants](https://www.arcgis.com/home/item.html?id=eb54b44c65b846cca12914b87b315169) feature layer with feature reduction enabled. When enabled, the cluster's symbology shows the color of the most common power plant type, and a size relative to the average plant capacity of the cluster.
+
+## Tags
+
+aggregate, bin, cluster, group, merge, normalize, reduce, summarize
diff --git a/Shared/Samples/Display points using clustering feature reduction/README.metadata.json b/Shared/Samples/Display points using clustering feature reduction/README.metadata.json
@@ -0,0 +1,35 @@
+{
+    "category": "Visualization",
+    "description": "Display a web map with a point feature layer that has feature reduction enabled to aggregate points into clusters.",
+    "ignore": false,
+    "images": [
+        "display-points-using-clustering-feature-reduction.png"
+    ],
+    "keywords": [
+        "aggregate",
+        "bin",
+        "cluster",
+        "group",
+        "merge",
+        "normalize",
+        "reduce",
+        "summarize",
+        "AggregateGeoElement",
+        "FeatureLayer",
+        "FeatureReduction",
+        "GeoElement",
+        "IdentifyLayerResult"
+    ],
+    "redirect_from": [],
+    "relevant_apis": [
+        "AggregateGeoElement",
+        "FeatureLayer",
+        "FeatureReduction",
+        "GeoElement",
+        "IdentifyLayerResult"
+    ],
+    "snippets": [
+        "DisplayPointsUsingClusteringFeatureReductionView.swift"
+    ],
+    "title": "Display points using clustering feature reduction"
+}
diff --git a/Shared/Samples/Display points using clustering feature reduction/display-points-using-clustering-feature-reduction.png b/Shared/Samples/Display points using clustering feature reduction/display-points-using-clustering-feature-reduction.png
diff --git a/Shared/Samples/Query feature table/QueryFeatureTableView.swift b/Shared/Samples/Query feature table/QueryFeatureTableView.swift
@@ -14,7 +14,6 @@
 
 import SwiftUI
 import ArcGIS
-import ArcGISToolkit
 
 struct QueryFeatureTableView: View {
     @StateObject private var model = Model()
diff --git a/Shared/Samples/Show line of sight between points/ShowLineOfSightBetweenPointsView.swift b/Shared/Samples/Show line of sight between points/ShowLineOfSightBetweenPointsView.swift
@@ -14,7 +14,6 @@
 
 import SwiftUI
 import ArcGIS
-import ArcGISToolkit
 
 struct ShowLineOfSightBetweenPointsView: View {
     /// A scene with an imagery basemap and centered on mountains in Chile.

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ struct AddDynamicEntityLayerView: View {`
`41`	`41`	`Button(isConnected ? "Disconnect" : "Connect") {`
`42`	`42`	`Task {`
`43`	`43`	`if isConnected {`
`44`		`- try? await model.streamService.disconnect()`
	`44`	`+ await model.streamService.disconnect()`
`45`	`45`	`} else {`
`46`	`46`	`try? await model.streamService.connect()`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,8 @@ extension AnalyzeNetworkWithSubnetworkTraceView {`
`347`	`347`	`return value as! Double`
`348`	`348`	`case .boolean:`
`349`	`349`	`return value as! Bool`
	`350`	`+ @unknown default:`
	`351`	`+ fatalError("Unexpected utility network attribute data type.")`
`350`	`352`	`}`
`351`	`353`	`}`
`352`	`354`	`}`