Merge pull request #430 from Esri/Ting/Update-SnappingGO

[Update] Add graphics overlay as a snap source to `Snap geometry edits`

Author: yo1995

Shared/Samples/Snap geometry edits/README.md

@@ -12,9 +12,9 @@ A field worker can create new features by editing and snapping the vertices of a
 
 To create a geometry, press the create button to choose the geometry type you want to create (i.e. points, multipoints, polyline, or polygon) and interactively tap and drag on the map view to create the geometry.
 
-To configure snapping, press the snap settings button to enable or disable snapping and choose which layers to snap to.
+To configure snapping, press the snap settings button to enable or disable snapping and choose which snap sources to snap to.
 
-To interactively snap a vertex, ensure that snapping is enabled and move the mouse pointer or drag a vertex close to an existing feature. When the pointer is close to a feature, the edit position will be adjusted to coincide with (or snap to), edges and vertices of that feature. Release the touch pointer to place the vertex at the snapped location.
+To interactively snap a vertex to a feature or graphic, ensure that snapping is enabled for the relevant snap source and move the mouse pointer or drag a vertex close to an existing feature or graphic. When the pointer is close to that existing geoelement, the edit position will be adjusted to coincide with (or snap to), edges and vertices of its geometry. Release the touch pointer to place the vertex at the snapped location.
 
 To more clearly see how the vertex is snapped, long press to invoke the magnifier before starting to move the pointer.
 
@@ -33,6 +33,7 @@ To more clearly see how the vertex is snapped, long press to invoke the magnifie
 * Geometry
 * GeometryEditor
 * GeometryEditorStyle
+* GraphicsOverlay
 * MapView
 * SnapSettings
 * SnapSource
@@ -52,4 +53,4 @@ Snapping can be used during interactive edits that move existing vertices using
 
 ## Tags
 
-edit, feature, geometry editor, layers, map, snapping
+edit, feature, geometry editor, graphics, layers, map, snapping

Shared/Samples/Snap geometry edits/README.metadata.json

@@ -9,13 +9,15 @@
         "edit",
         "feature",
         "geometry editor",
+        "graphics",
         "layers",
         "map",
         "snapping",
         "FeatureLayer",
         "Geometry",
         "GeometryEditor",
         "GeometryEditorStyle",
+        "GraphicsOverlay",
         "MapView",
         "SnapSettings",
         "SnapSource",
@@ -27,6 +29,7 @@
         "Geometry",
         "GeometryEditor",
         "GeometryEditorStyle",
+        "GraphicsOverlay",
         "MapView",
         "SnapSettings",
         "SnapSource",

Shared/Samples/Snap geometry edits/SnapGeometryEditsView.GeometryEditorModel.swift

@@ -23,7 +23,11 @@ extension SnapGeometryEditsView {
         let geometryEditor = GeometryEditor()
 
         /// The graphics overlay used to save geometries to.
-        let geometryOverlay = GraphicsOverlay(renderingMode: .dynamic)
+        let geometryOverlay: GraphicsOverlay = {
+            let overlay = GraphicsOverlay(renderingMode: .dynamic)
+            overlay.id = "Graphics Overlay"
+            return overlay
+        }()
 
         /// A Boolean value indicating if the saved sketches can be cleared.
         @Published private(set) var canClearSavedSketches = false

Shared/Samples/Snap geometry edits/SnapGeometryEditsView.SnapSettingsView.swift

@@ -27,24 +27,24 @@ extension SnapGeometryEditsView {
         /// for the geometry editor.
         @State private var snappingEnabled = false
 
-        /// An array of snap source layer names and their source settings.
-        @State private var snapSources: [(layerName: String, sourceSettings: SnapSourceSettings)] = []
+        /// An array of snap source names and their source settings.
+        @State private var snapSources: [(name: String, sourceSettings: SnapSourceSettings)] = []
 
         /// An array of Boolean values for each snap source enabled states.
         @State private var snapSourceEnabledStates: [Bool] = []
 
         var body: some View {
             Form {
-                Section("Snap Source") {
+                Section("Geometry Editor Snapping") {
                     Toggle("Snapping", isOn: $snappingEnabled)
                         .onChange(of: snappingEnabled) { newValue in
                             model.geometryEditor.snapSettings.isEnabled = newValue
                         }
                 }
 
-                Section("Layer Snapping") {
+                Section("Individual Source Snapping") {
                     ForEach(0 ..< snapSources.count, id: \.self) { index in
-                        Toggle(snapSources[index].layerName, isOn: $snapSourceEnabledStates[index])
+                        Toggle(snapSources[index].name, isOn: $snapSourceEnabledStates[index])
                             .onChange(of: snapSourceEnabledStates[index]) { newValue in
                                 snapSources[index].sourceSettings.isEnabled = newValue
                             }
@@ -65,11 +65,16 @@ extension SnapGeometryEditsView {
                 model.geometryEditor.snapSettings.isEnabled = true
                 snappingEnabled = model.geometryEditor.snapSettings.isEnabled
 
-                // Creates an array from snap source layers with their
-                // layer name and source settings.
+                // Creates an array from snap source layers or graphics overlays
+                // with their name and source settings.
                 snapSources = model.geometryEditor.snapSettings.sourceSettings.compactMap { sourceSettings in
-                    guard let layer = sourceSettings.source as? FeatureLayer else { return nil }
-                    return (layer.name, sourceSettings)
+                    if let layer = sourceSettings.source as? FeatureLayer {
+                        return (layer.name, sourceSettings)
+                    } else if let graphicsOverlay = sourceSettings.source as? GraphicsOverlay {
+                        return (graphicsOverlay.id, sourceSettings)
+                    } else {
+                        return nil
+                    }
                 }
 
                 // Initializes the enabled states from the snap sources.

Shared/Samples/Snap geometry edits/SnapGeometryEditsView.swift

@@ -71,7 +71,7 @@ struct SnapGeometryEditsView: View {
                             // Various snapping settings for a geometry editor.
                             SnapSettingsView(model: model)
                         }
-                        .presentationDetents([.fraction(0.5)])
+                        .presentationDetents([.fraction(0.6)])
                         .frame(idealWidth: 320, idealHeight: 380)
                     }
                     .disabled(!layersAreLoaded)