Merge pull request #157 from Esri/tschie/update-route-samples

Tschie/update route samples

Author: tschie

src/main/java/com/esri/samples/na/closest_facility/ClosestFacilitySample.java

@@ -16,6 +16,7 @@
 package com.esri.samples.na.closest_facility;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
@@ -170,7 +171,7 @@ private void populateParametersAndSolveRoute() {
     facilityParameters.clearIncidents();
     // set new parameters to find route
     facilityParameters.setFacilities(facilities);
-    facilityParameters.setIncidents(Arrays.asList(new Incident(incidentPoint)));
+    facilityParameters.setIncidents(Collections.singletonList(new Incident(incidentPoint)));
 
     // find closest route using parameters from above
     ListenableFuture<ClosestFacilityResult> result = task.solveClosestFacilityAsync(facilityParameters);

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 {

src/main/java/com/esri/samples/na/service_areas/README.md renamed to src/main/java/com/esri/samples/na/service_area_task/README.md

@@ -1,44 +1,44 @@
-<h1>Service Area Task</h1>
-
-<p>Demonstrates how to find services areas around a point using the ServiceAreaTask. A service area shows locations that can be reached from a facility based off a certain impedance [such as travel time]. Barriers can also be added which can effect the impedance by not letting traffic through or adding the time is takes to pass that barrier.</p>
-
-<p><img src="ServiceAreaTask.gif"/></p>
-
-<h2>How to use sample</h2>
-<li>In order to find any service areas at least one ServiceAreaFaciltiy needs to be added.</li>
-<li>To add a facility, click the facility button, then click anywhere on the MapView.</li>
-<li>To add a barrier, click the barrier button, and click multiple locations on MapView.</li>
-<ul><li>Hit the barrier button again to finish drawing barrier.</li>
-<li>Hitting any other button will also stop the barrier from drawing.</li></ul>
-<li>To show service areas around facilities that were added, click show service areas button.</li>
-<li>Reset button, clears all graphics and reset ServiceAreaTask.</li>
-
-<h2>How it works</h2>
-
-<p>To display service areas around a certain location:</p>
-
-<ol>
-<li>Create a <code>ServiceAreaTask</code> from an online service.</li>
-<li>Get ServiceAreaParameters from task, <code>task.createDefaultParametersAsync()</code></li>
-<li>Setting return polygons to true will return all services areas, <code>serviceAreaParameters.setReturnPolygons(true)</code></li>
-<li>Add a <code>ServiceAreaFacilty</code> to parameters, <code>serviceAreaParameters.setFacilities(serviceAreaFacility)</code></li>
-<li>Get <code>ServiceAreaResult</code> by solving the service area task using parameters, <code>task.solveServiceAreaAsync(serviceAreaParameters).get()</code></li>
-<li>Get any <code>ServiceAreaPolygon</code>s that were returned, <code>serviceAreaResult.getResultPolygons(facilityIndex)</code></li>
-<ul><li>facilityIndex is the faciltiy from the mapview that you want to get the services areas of</li></ul>
-<li>Display services areas to MapView, <code>graphicsOverlay.getGraphics().add(new Graphic(serviceAreaPolygon.getGeometry(), fillSymbol))</code></li>
-</ol>
-
-<h2>Features</h2>
-<ul>
-    <li>ArcGISMap</li>
-    <li>GraphicsOverlay</li>
-    <li>MapView</li>
-    <li>PolylineBarrier</li>
-    <li>ServiceAreaFacility</li>
-    <li>ServiceAreaParameters</li>
-    <li>ServiceAreaPolygon</li>
-    <li>ServiceAreaResult</li>
-    <li>ServiceAreaTask</li>
-    <li>PolylineBuilder</li>
-</ul>
-
+<h1>Service Area Task</h1>
+
+<p>Demonstrates how to find services areas around a point using the ServiceAreaTask. A service area shows locations that can be reached from a facility based off a certain impedance [such as travel time]. Barriers can also be added which can effect the impedance by not letting traffic through or adding the time is takes to pass that barrier.</p>
+
+<p><img src="ServiceAreaTask.gif"/></p>
+
+<h2>How to use sample</h2>
+<li>In order to find any service areas at least one ServiceAreaFaciltiy needs to be added.</li>
+<li>To add a facility, click the facility button, then click anywhere on the MapView.</li>
+<li>To add a barrier, click the barrier button, and click multiple locations on MapView.</li>
+<ul><li>Hit the barrier button again to finish drawing barrier.</li>
+<li>Hitting any other button will also stop the barrier from drawing.</li></ul>
+<li>To show service areas around facilities that were added, click show service areas button.</li>
+<li>Reset button, clears all graphics and reset ServiceAreaTask.</li>
+
+<h2>How it works</h2>
+
+<p>To display service areas around a certain location:</p>
+
+<ol>
+<li>Create a <code>ServiceAreaTask</code> from an online service.</li>
+<li>Get ServiceAreaParameters from task, <code>task.createDefaultParametersAsync()</code></li>
+<li>Setting return polygons to true will return all services areas, <code>serviceAreaParameters.setReturnPolygons(true)</code></li>
+<li>Add a <code>ServiceAreaFacilty</code> to parameters, <code>serviceAreaParameters.setFacilities(serviceAreaFacility)</code></li>
+<li>Get <code>ServiceAreaResult</code> by solving the service area task using parameters, <code>task.solveServiceAreaAsync(serviceAreaParameters).get()</code></li>
+<li>Get any <code>ServiceAreaPolygon</code>s that were returned, <code>serviceAreaResult.getResultPolygons(facilityIndex)</code></li>
+<ul><li>facilityIndex is the faciltiy from the mapview that you want to get the services areas of</li></ul>
+<li>Display services areas to MapView, <code>graphicsOverlay.getGraphics().add(new Graphic(serviceAreaPolygon.getGeometry(), fillSymbol))</code></li>
+</ol>
+
+<h2>Features</h2>
+<ul>
+    <li>ArcGISMap</li>
+    <li>GraphicsOverlay</li>
+    <li>MapView</li>
+    <li>PolylineBarrier</li>
+    <li>ServiceAreaFacility</li>
+    <li>ServiceAreaParameters</li>
+    <li>ServiceAreaPolygon</li>
+    <li>ServiceAreaResult</li>
+    <li>ServiceAreaTask</li>
+    <li>PolylineBuilder</li>
+</ul>
+