Update Graphic - Update code and improve UI (#507)

Co-authored-by: Tyler Schiewe <[email protected]>

Author: JonLavi

display_information/update-graphics/src/main/java/com/esri/samples/update_graphics/UpdateGraphicsSample.java

@@ -16,10 +16,6 @@
 
 package com.esri.samples.update_graphics;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
 import javafx.application.Application;
 import javafx.geometry.Insets;
 import javafx.geometry.Point2D;
@@ -38,11 +34,13 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 
 import com.esri.arcgisruntime.concurrent.ListenableFuture;
 import com.esri.arcgisruntime.geometry.Point;
 import com.esri.arcgisruntime.geometry.SpatialReference;
-import com.esri.arcgisruntime.loadable.LoadStatus;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
 import com.esri.arcgisruntime.mapping.Basemap;
 import com.esri.arcgisruntime.mapping.view.Graphic;
@@ -55,6 +53,9 @@ public class UpdateGraphicsSample extends Application {
 
   private boolean isUpdateLocationActive;
   private List<SimpleMarkerSymbol> markers;
+  private Button updateLocationButton;
+  private Button updateDescriptionButton;
+  private ComboBox<String> symbolBox;
 
   private ArcGISMap map; // keep loadable in scope to avoid garbage collection
   private MapView mapView;
@@ -87,52 +88,23 @@ public void start(Stage stage) {
       // create a control panel
       VBox controlsVBox = new VBox(6);
       controlsVBox.setBackground(new Background(new BackgroundFill(Paint.valueOf("rgba(0,0,0,0.3)"), CornerRadii.EMPTY,
-          Insets.EMPTY)));
+              Insets.EMPTY)));
       controlsVBox.setPadding(new Insets(10.0));
       controlsVBox.setMaxSize(180, 150);
       controlsVBox.getStyleClass().add("panel-region");
 
       // create buttons for user interaction
-      Button updateLocationButton = new Button("Update Location");
-      Button updateDescriptionButton = new Button("Update Description");
+      updateLocationButton = new Button("Update Location");
+      updateDescriptionButton = new Button("Update Description");
       updateLocationButton.setMaxWidth(Double.MAX_VALUE);
       updateDescriptionButton.setMaxWidth(Double.MAX_VALUE);
       updateLocationButton.setDisable(true);
       updateDescriptionButton.setDisable(true);
 
-      // when clicked allow user to move graphic's location
-      updateLocationButton.setOnAction(e -> {
-        if (selectedGraphic.isSelected()) {
-          isUpdateLocationActive = true;
-        }
-      });
-
-      updateDescriptionButton.setOnAction(e -> {
-        if (selectedGraphic.isSelected()) {
-          // get attributes from selected graphic
-          java.util.Map<String, Object> attributes = selectedGraphic.getAttributes();
-
-          // create input dialog
-          TextInputDialog dialog = new TextInputDialog();
-          dialog.setTitle(attributes.get("NAME").toString());
-          dialog.setGraphic(null);
-          dialog.setHeaderText(attributes.get("DESCRIPTION").toString());
-          dialog.setContentText("New Description");
-
-          // set the graphic's description is text entered
-          Optional<String> result = dialog.showAndWait();
-          result.ifPresent(text -> {
-            if (!text.isEmpty()) {
-              attributes.put("DESCRIPTION", text);
-            }
-          });
-        }
-      });
-
       // create section for combo box
       Label symbolLabel = new Label("Update Symbol:");
       symbolLabel.getStyleClass().add("panel-label");
-      ComboBox<String> symbolBox = new ComboBox<>();
+      symbolBox = new ComboBox<>();
       symbolBox.getItems().addAll("CIRCLE", "TRIANGLE", "CROSS", "DIAMOND");
       symbolBox.getSelectionModel().selectFirst();
       symbolBox.setMaxWidth(Double.MAX_VALUE);
@@ -148,37 +120,53 @@ public void start(Stage stage) {
       // add label, dropdown and buttons to the control panel
       controlsVBox.getChildren().addAll(updateLocationButton, updateDescriptionButton, symbolLabel, symbolBox);
 
-      // create a graphics overlay
-      graphicsOverlay = new GraphicsOverlay();
-      selectedGraphic = new Graphic();
-
       // create a ArcGISMap with basemap light gray canvas
       map = new ArcGISMap(Basemap.Type.LIGHT_GRAY_CANVAS, 56.075844, -2.681572, 13);
 
-      // enable buttons when map view is done loading
-      map.addDoneLoadingListener(() -> {
-        if (map.getLoadStatus() == LoadStatus.LOADED) {
-          symbolBox.setDisable(false);
-          updateLocationButton.setDisable(false);
-          updateDescriptionButton.setDisable(false);
-        } else {
-          Alert alert = new Alert(Alert.AlertType.ERROR, "Map Failed to Load!");
-          alert.show();
-        }
-      });
-
       // create a map view and set the map to it
       mapView = new MapView();
       mapView.setMap(map);
 
+      // create a graphics overlay
+      graphicsOverlay = new GraphicsOverlay();
+
       // add graphics overlay to the map view
       mapView.getGraphicsOverlays().add(graphicsOverlay);
 
       // create default graphics for graphics overlay
       createGraphics();
 
+      // when clicked allow user to move graphic's location
+      updateLocationButton.setOnAction(e -> {
+        if (selectedGraphic.isSelected()) {
+          isUpdateLocationActive = true;
+        }
+      });
+
+      updateDescriptionButton.setOnAction(e -> {
+        if (selectedGraphic.isSelected()) {
+          // get attributes from selected graphic
+          java.util.Map<String, Object> attributes = selectedGraphic.getAttributes();
+
+          // create input dialog
+          TextInputDialog dialog = new TextInputDialog();
+          dialog.setTitle(attributes.get("NAME").toString());
+          dialog.setGraphic(null);
+          dialog.setHeaderText(attributes.get("DESCRIPTION").toString());
+          dialog.setContentText("New Description");
+
+          // set the graphic's description is text entered
+          Optional<String> result = dialog.showAndWait();
+          result.ifPresent(text -> {
+            if (!text.isEmpty()) {
+              attributes.put("DESCRIPTION", text);
+            }
+          });
+        }
+      });
+
       mapView.setOnMouseClicked(e -> {
-        if (e.getButton() == MouseButton.PRIMARY) {
+        if (e.getButton() == MouseButton.PRIMARY && e.isStillSincePress()) {
           // clear any selected graphic
           graphicsOverlay.clearSelection();
 
@@ -202,10 +190,13 @@ public void start(Stage stage) {
                   selectedGraphic.setSelected(true);
                   String style = ((SimpleMarkerSymbol) selectedGraphic.getSymbol()).getStyle().toString();
                   symbolBox.getSelectionModel().select(style);
+
+                  enableUI(false);
+                } else {
+                  enableUI(true);
                 }
               } catch (Exception x) {
-                // on any error, display the stack trace
-                x.printStackTrace();
+                new Alert(Alert.AlertType.ERROR, "Error identifying clicked graphic").show();
               }
             });
           }
@@ -269,6 +260,12 @@ private void createGraphics() {
     }
   }
 
+  private void enableUI(boolean enable) {
+    updateDescriptionButton.setDisable(enable);
+    updateLocationButton.setDisable(enable);
+    symbolBox.setDisable(enable);
+  }
+
   /**
    * Stops and releases all resources used in application.
    */