Apply suggestions from code review

Co-authored-by: Philip Ridgeway <[email protected]>

Author: CalebRas

Shared/Samples/Snap geometry edits with utility network rules/README.md

@@ -12,9 +12,9 @@ A field worker can create new features in a utility network by editing and snapp
 
 To edit a geometry, tap a feature on the map to select it and press the edit button to start the geometry editor.
 
-Tap the "Snap Sources" button to view and enable/disable the snap sources. To interactively snap a vertex to a feature or graphic, ensure that snapping is enabled for the relevant snap source, then drag a vertex to nearby an existing feature or graphic. If the existing feature or graphic has valid utility network connectivity rules for the asset type that is being created or edited, the edit position will be adjusted to coincide with (or snap to) edges and vertices of its geometry. Tap to place the vertex at the snapped location. Snapping will not occur when `SnapRuleBehavior.rulesPreventSnapping` even when the source is enabled.
+Tap the "Snap Sources" button to view and enable/disable the snap sources. To interactively snap a vertex to a feature or graphic, ensure that snapping is enabled for the relevant snap source, then drag a vertex to nearby an existing feature or graphic. If the existing feature or graphic has valid utility network connectivity rules for the asset type that is being created or edited, the edit position will be adjusted to coincide with (or snap to) edges and vertices of its geometry. Tap to place the vertex at the snapped location. Snapping will not occur when `SnapRuleBehavior.rulesPreventSnapping` is `true`, even when the source is enabled.
 
-To discard changes and stop the geometry editor, press the cancel button. To save your edits, press the save button.
+To discard changes and stop the geometry editor, press the Cancel (X) button. To save your edits, press the Save (✔️) button.
 
 ## How it works
 

Shared/Samples/Snap geometry edits with utility network rules/SnapGeometryEditsWithUtilityNetworkRulesView.Model.swift

@@ -123,10 +123,9 @@ extension SnapGeometryEditsWithUtilityNetworkRulesView {
                 "Excess Flow Valve",
                 "Controllable Tee"
             ]
-            for sublayer in lineLayer.subtypeSublayers + deviceLayer.subtypeSublayers {
-                if !visibleSublayerNames.contains(sublayer.name) {
-                    sublayer.isVisible = false
-                }
+            let sublayers = lineLayer.subtypeSublayers + deviceLayer.subtypeSublayers
+            for sublayer in sublayers where !visibleSublayerNames.contains(sublayer.name) {
+                sublayer.isVisible = false
             }
         }
 
@@ -187,16 +186,18 @@ extension SnapGeometryEditsWithUtilityNetworkRulesView {
             }
 
             // Hides the selected feature on the layer.
-            let featureTable = selectedFeature.table as? ArcGISFeatureTable
-            let featureLayer = featureTable?.layer as? FeatureLayer
-            featureLayer?.setVisible(false, for: selectedFeature)
-            
-            // Gets the selected feature's symbol and uses it to set the tool's style.
-            let symbol = featureTable?.layerInfo?.drawingInfo?.renderer?.symbol(for: selectedFeature)
-            vertexTool.style.vertexSymbol = symbol
-            vertexTool.style.feedbackVertexSymbol = symbol
-            vertexTool.style.selectedVertexSymbol = symbol
-            vertexTool.style.vertexTextSymbol = nil
+            if let featureTable = selectedFeature.table as? ArcGISFeatureTable {
+                if let featureLayer = featureTable.layer as? FeatureLayer {
+                    featureLayer.setVisible(false, for: selectedFeature)
+                }
+                
+                // Gets the selected feature's symbol and uses it to set the tool's style.
+                let symbol = featureTable.layerInfo?.drawingInfo?.renderer?.symbol(for: selectedFeature)
+                vertexTool.style.vertexSymbol = symbol
+                vertexTool.style.feedbackVertexSymbol = symbol
+                vertexTool.style.selectedVertexSymbol = symbol
+                vertexTool.style.vertexTextSymbol = nil
+            }
 
             geometryEditor.tool = vertexTool
             geometryEditor.start(withInitial: geometry)
@@ -234,7 +235,7 @@ extension SnapGeometryEditsWithUtilityNetworkRulesView {
             _ settings: [SnapSourceSettings]
         ) -> [SnapSourceSettings] {
             let sourceNames: Set<String> = [.distributionPipe, .graphics, .pipelineLine, .servicePipe]
-            return settings.reduce(into: [SnapSourceSettings]()) { result, setting in
+            return settings.reduce(into: []) { result, setting in
                 guard sourceNames.contains(setting.source.name) else {
                     return
                 }

Shared/Samples/Snap geometry edits with utility network rules/SnapGeometryEditsWithUtilityNetworkRulesView.swift

@@ -252,9 +252,9 @@ extension SnapSource {
     }
 }
 
-extension SnapRuleBehavior? {
+extension Optional<SnapRuleBehavior> {
     fileprivate static var allCases: [Self] {
-        return [nil, .rulesLimitSnapping, .rulesPreventSnapping]
+        return [.none, .rulesLimitSnapping, .rulesPreventSnapping]
     }
 
     /// The human-readable label for the snap rule behavior.