removed use of deprecated api

Author: tschie

src/main/java/com/esri/samples/na/offline_routing/OfflineRoutingSample.java

@@ -11,10 +11,11 @@
 
 package com.esri.samples.na.offline_routing;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
 
 import javafx.application.Application;
 import javafx.event.EventHandler;
@@ -57,6 +58,7 @@ public class OfflineRoutingSample extends Application {
   private GraphicsOverlay routeOverlay;
   private RouteTask routeTask;
   private RouteParameters routeParameters;
+  private List<Graphic> stopGraphics;
   private LineSymbol lineSymbol;
 
   private EventHandler<MouseEvent> mouseMovedListener;
@@ -89,6 +91,7 @@ public void start(Stage stage) throws Exception {
       stopsOverlay = new GraphicsOverlay();
       routeOverlay = new GraphicsOverlay();
       mapView.getGraphicsOverlays().addAll(Arrays.asList(routeOverlay, stopsOverlay));
+      stopGraphics = new ArrayList<>();
 
       // create an offline RouteTask
       routeTask = new RouteTask("./samples-data/san_diego/sandiego.geodatabase", "Streets_ND");
@@ -111,10 +114,6 @@ public void start(Stage stage) throws Exception {
           // update the moving stop and graphic
           Graphic stopGraphic = stopsOverlay.getSelectedGraphics().get(0);
           stopGraphic.setGeometry(hoverPoint);
-          int stopIndex = (int) stopGraphic.getAttributes().get("stopIndex");
-          Stop newStop = new Stop(hoverPoint);
-          routeParameters.getStops().set(stopIndex, newStop);
-          stopGraphic.getAttributes().put("stopIndex", stopIndex);
 
           // update route
           if (stopsOverlay.getGraphics().size() > 1) {
@@ -136,21 +135,14 @@ public void start(Stage stage) throws Exception {
           // left click adds a stop when not already moving a stop
           if (event.getButton() == MouseButton.PRIMARY && stopsOverlay.getSelectedGraphics().isEmpty()) {
 
-            // add stop to route parameters
-            Stop stop = new Stop(point);
-            routeParameters.getStops().add(stop);
-
             // create graphic for stop
             TextSymbol stopLabel = new TextSymbol(20, Integer.toString(stopsOverlay.getGraphics().size() + 1),
                 0xFFFF0000, TextSymbol.HorizontalAlignment.RIGHT, TextSymbol.VerticalAlignment.TOP);
 
-            // save the stop with the graphic
-            HashMap<String, Object> attributes = new HashMap<>();
-            attributes.put("stopIndex", routeParameters.getStops().size() - 1);
-
-            // create and add the stop graphic to the graphics overlay
-            Graphic stopGraphic = new Graphic(point, attributes, stopLabel);
+            // create and add the stop graphic to the graphics overlay and list
+            Graphic stopGraphic = new Graphic(point, stopLabel);
             stopsOverlay.getGraphics().add(stopGraphic);
+            stopGraphics.add(stopGraphic);
 
             // update the route
             updateRoute();
@@ -230,13 +222,17 @@ public TravelMode fromString(String fileName) {
    */
   private void updateRoute() {
 
-    if (routeParameters.getStops().size() > 1) {
+    if (stopGraphics.size() > 1) {
       // remove listener until route task is solved
       if (!stopsOverlay.getSelectedGraphics().isEmpty()) {
         mapView.setOnMouseMoved(null);
       }
 
-      // solve route
+      // update stops and solve route
+      List<Stop> stops = stopGraphics.stream()
+          .map(g -> new Stop((Point) g.getGeometry()))
+          .collect(Collectors.toList());
+      routeParameters.setStops(stops);
       ListenableFuture<RouteResult> results = routeTask.solveRouteAsync(routeParameters);
       results.addDoneListener(() -> {
         try {