Merge branch 'main' into v.next

Author: Rachael Ellen

display_information/sketch-on-map/README.md

@@ -10,7 +10,7 @@ A field worker could annotate features of interest on a map (via the GUI) such a
 
 ## How to use the sample
 
-Choose which geometry type to sketch from one of the available buttons. Choose from points, multipoints, polylines, polygons, freehand polylines, and freehand polygons.
+Choose which geometry type to sketch from one of the available buttons. Choose from points, multipoints, polylines, polygons, freehand polylines, freehand polygons and rectangles.
 
 Use the control panel to cancel the sketch, undo or redo changes made to the sketch and to save the sketch to the graphics overlay. There is also the option to select a saved graphic and edit its geometry using the Sketch Editor. The graphics overlay can be cleared using the clear all button.
 

display_information/sketch-on-map/SketchOnMap.png

@@ -36,7 +36,6 @@
 import com.esri.arcgisruntime.symbology.SimpleLineSymbol;
 import com.esri.arcgisruntime.symbology.SimpleMarkerSymbol;
 
-
 public class SketchOnMapController {
 
   @FXML
@@ -189,6 +188,15 @@ private void handleFreehandPolygonButtonClicked() {
     sketchEditor.start(SketchCreationMode.FREEHAND_POLYGON);
   }
 
+  /**
+   * Clear selection of any graphic in the graphics overlay and start a new rectangle sketch.
+   */
+  @FXML
+  private void handleRectangleButtonClicked() {
+    graphicsOverlay.clearSelection();
+    sketchEditor.start(SketchCreationMode.RECTANGLE);
+  }
+
   /**
    * Undo the last change made to the sketch, whilst sketching is active.
    */

display_information/sketch-on-map/src/main/java/com/esri/samples/sketch_on_map/SketchOnMapController.java

@@ -129,6 +129,16 @@
                     <Tooltip text="Freehand Polygon"/>
                 </tooltip>
             </Button>
+            <Button onAction="#handleRectangleButtonClicked" GridPane.rowIndex="3" GridPane.columnIndex="0">
+                <graphic>
+                    <ImageView>
+                        <Image url="/sketch_on_map/rectangle.png"/>
+                    </ImageView>
+                </graphic>
+                <tooltip>
+                    <Tooltip text="Rectangle"/>
+                </tooltip>
+            </Button>
         </GridPane>
         <Separator maxWidth="100"/>
         <GridPane vgap="6" hgap="6">