resolved conflicts

Author: tschie

src/main/java/com/esri/samples/map/change_basemap/ChangeBasemapSample.java

@@ -76,9 +76,6 @@ public void start(Stage stage) throws Exception {
 
         // listener to switch ArcGISMap types when button clicked
         button.setOnAction(e -> {
-          if (map != null) {
-            mapView.setMap(null);
-          }
           map = new ArcGISMap(Basemap.Type.valueOf(basemapString), LATITUDE, LONGITUDE, LOD);
           mapView.setMap(map);
         });

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

@@ -250,13 +250,14 @@ private void updateRoute() {
           routeOverlay.getGraphics().clear();
           routeOverlay.getGraphics().add(graphic);
 
+        } catch (InterruptedException | ExecutionException e) {
+          // ignore, no route solution
+
+        } finally {
           // add mouse moved listener back
           if (!stopsOverlay.getSelectedGraphics().isEmpty()) {
             mapView.setOnMouseMoved(mouseMovedListener);
           }
-
-        } catch (InterruptedException | ExecutionException e) {
-          e.printStackTrace();
         }
       });
     }

src/main/java/com/esri/samples/raster/blend_renderer/README.md

@@ -12,18 +12,18 @@ the satellite imagery, choose the color ramp type NONE.</p>
 
 <h2>How it works</h2>
 
-<p>To apply a `BlendRenderer` to a `RasterLayer`:</p>
+<p>To apply a <code>BlendRenderer</code> to a <code>RasterLayer</code>:</p>
 <ol>
-  <li>Create a `Raster` from a raster file</li>
-  <li>Create a `RasterLayer` from the raster</li>
-  <li>Create a `Basemap` from the raster layer and set it to the map</li>
-  <li>Create a `Raster` for elevation from a grayscale raster file</li>
-  <li>Create a `BlendRenderer`, specifying the elevation raster, color ramp, and other properties</li>
+  <li>Create a <code>Raster</code> from a raster file</li>
+  <li>Create a <code>RasterLayer</code> from the raster</li>
+  <li>Create a <code>Basemap</code> from the raster layer and set it to the map</li>
+  <li>Create a <code>Raster</code> for elevation from a grayscale raster file</li>
+  <li>Create a <code>BlendRenderer</code>, specifying the elevation raster, color ramp, and other properties</li>
   <ul>
     <li>If you specify a non-null color ramp, use the elevation raster as the base raster in addition to the 
     elevation raster parameter. That way the color ramp is used instead of the satellite imagery</li>
   </ul>
-  <li>Set the renderer on the raster layer with `rasterLayer.setRenderer(renderer)`.</li>
+  <li>Set the renderer on the raster layer with <code>rasterLayer.setRenderer(renderer)</code>.</li>
 </ol>
 
 <h2>Features</h2>

src/main/java/com/esri/samples/raster/hillshade_renderer/HillshadeRendererController.java

@@ -33,15 +33,14 @@ public class HillshadeRendererController {
 
   @FXML private MapView mapView;
   @FXML private ComboBox<SlopeType> slopeTypeComboBox;
-  @FXML private ComboBox<ColorRamp.PresetType> colorRampComboBox;
   @FXML private Slider azimuthSlider;
   @FXML private Slider altitudeSlider;
 
   private RasterLayer rasterLayer;
 
   public void initialize() {
 
-    // create rasters
+    // create raster
     Raster raster = new Raster(new File("./samples-data/raster/srtm.tiff").getAbsolutePath());
 
     // create a raster layer

src/main/java/com/esri/samples/raster/hillshade_renderer/README.md

@@ -11,13 +11,13 @@ terrain) according to a sun angle.</p>
 
 <h2>How it works</h2>
 
-<p>To apply a `HillshadeRenderer` to a `RasterLayer`:</p>
+<p>To apply a <code>HillshadeRenderer</code> to a <code>RasterLayer</code>:</p>
 <ol>
-  <li>Create a `Raster` from a grayscale raster file</li>
-  <li>Create a `RasterLayer` from the raster</li>
-  <li>Create a `Basemap` from the raster layer and set it to the map</li>
-  <li>Create a `HillshadeRenderer`, specifying the slope type and other properties</li>
-  <li>Set the renderer on the raster layer with `rasterLayer.setRenderer(renderer)`.</li>
+  <li>Create a <code>Raster</code> from a grayscale raster file</li>
+  <li>Create a <code>RasterLayer</code> from the raster</li>
+  <li>Create a <code>Basemap</code> from the raster layer and set it to the map</li>
+  <li>Create a <code>HillshadeRenderer</code>, specifying the slope type and other properties</li>
+  <li>Set the renderer on the raster layer with <code>rasterLayer.setRenderer(renderer)</code>.</li>
 </ol>
 
 <h2>Features</h2>

src/main/java/com/esri/samples/raster/rgb_renderer/README.md

@@ -11,13 +11,13 @@ image.</p>
 
 <h2>How it works</h2>
 
-<p>To apply a `RgbRenderer` to a `RasterLayer`:</p>
+<p>To apply a <code>RgbRenderer</code> to a <code>RasterLayer</code>:</p>
 <ol>
-  <li>Create a `Raster` from a multispectral raster file</li>
-  <li>Create a `RasterLayer` from the raster</li>
-  <li>Create a `Basemap` from the raster layer and set it to the map</li>
-  <li>Create a `RgbRenderer`, specifying the stretch parameters and other properties</li>
-  <li>Set the renderer on the raster layer with `rasterLayer.setRenderer(renderer)`</li>
+  <li>Create a <code>Raster</code> from a multispectral raster file</li>
+  <li>Create a <code>RasterLayer</code> from the raster</li>
+  <li>Create a <code>Basemap</code> from the raster layer and set it to the map</li>
+  <li>Create a <code>RgbRenderer</code>, specifying the stretch parameters and other properties</li>
+  <li>Set the renderer on the raster layer with <code>rasterLayer.setRenderer(renderer)</code></li>
 </ol>
 
 <h2>Features</h2>

src/main/java/com/esri/samples/raster/rgb_renderer/RgbRendererController.java

@@ -50,7 +50,7 @@ public class RgbRendererController {
 
   public void initialize() {
 
-    // create rasters
+    // create raster
     Raster raster = new Raster(new File("./samples-data/raster/Shasta.tif").getAbsolutePath());
 
     // create a raster layer

src/main/java/com/esri/samples/raster/stretch_renderer/README.md

@@ -12,13 +12,13 @@ in dark images.</p>
 
 <h2>How it works</h2>
 
-<p>To apply a `StretchRenderer` to a `RasterLayer`:</p>
+<p>To apply a <code>StretchRenderer</code> to a <code>RasterLayer</code>:</p>
 <ol>
-  <li>Create a `Raster` from a raster file</li>
-  <li>Create a `RasterLayer` from the raster</li>
-  <li>Create a `Basemap` from the raster layer and set it to the map</li>
-  <li>Create a `StretchRenderer`, specifying the stretch parameters and other properties</li>
-  <li>Set the renderer on the raster layer with `rasterLayer.setRenderer(renderer)`</li>
+  <li>Create a <code>Raster</code> from a raster file</li>
+  <li>Create a <code>RasterLayer</code> from the raster</li>
+  <li>Create a <code>Basemap</code> from the raster layer and set it to the map</li>
+  <li>Create a <code>StretchRenderer</code>, specifying the stretch parameters and other properties</li>
+  <li>Set the renderer on the raster layer with <code>rasterLayer.setRenderer(renderer)</code></li>
 </ol>
 
 <h2>Features</h2>

src/main/java/com/esri/samples/raster/stretch_renderer/StretchRendererController.java

@@ -41,7 +41,7 @@ public class StretchRendererController {
 
   public void initialize() {
 
-    // create rasters
+    // create raster
     Raster raster = new Raster(new File("./samples-data/raster/ShastaBW.tif").getAbsolutePath());
 
     // create a raster layer