Merge branch 'main' into v.next

Author: Rachael-E

raster/blend-renderer/src/main/java/com/esri/samples/blend_renderer/BlendRendererController.java

@@ -24,6 +24,7 @@
 import javafx.scene.control.Slider;
 
 import com.esri.arcgisruntime.layers.RasterLayer;
+import com.esri.arcgisruntime.loadable.LoadStatus;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
 import com.esri.arcgisruntime.mapping.Basemap;
 import com.esri.arcgisruntime.mapping.view.MapView;
@@ -49,15 +50,19 @@ public void initialize() {
     imageryRasterPath = new File(System.getProperty("data.dir"), "./samples-data/raster/Shasta.tif").getAbsolutePath();
     elevationRasterPath = new File(System.getProperty("data.dir"), "./samples-data/raster/Shasta_Elevation.tif").getAbsolutePath();
 
-    // create a raster layer
+    // create and load a raster layer
     RasterLayer rasterLayer = new RasterLayer(new Raster(imageryRasterPath));
-
-    // create a basemap from the raster layer
-    Basemap basemap = new Basemap(rasterLayer);
-    ArcGISMap map = new ArcGISMap(basemap);
-
-    // set the map to the map view
-    mapView.setMap(map);
+    // when the raster has loaded create a basemap from it and create a new ArcGISMap with the basemap
+    rasterLayer.addDoneLoadingListener(() -> {
+      if (rasterLayer.getLoadStatus() == LoadStatus.LOADED) {
+        Basemap basemap = new Basemap(rasterLayer);
+        ArcGISMap map = new ArcGISMap(basemap);
+        // set the map to the map view
+        mapView.setMap(map);
+        updateRenderer();
+      }
+    });
+    rasterLayer.loadAsync();
 
     // set defaults
     colorRampComboBox.getItems().setAll(ColorRamp.PresetType.values());
@@ -77,27 +82,35 @@ public void initialize() {
       }
     });
 
-    updateRenderer();
   }
 
   /**
    * Updates the raster layer renderer according to the chosen property values.
    */
   public void updateRenderer() {
 
-    ColorRamp colorRamp = colorRampComboBox.getSelectionModel().getSelectedItem() != ColorRamp.PresetType.NONE
-        ? new ColorRamp(colorRampComboBox.getSelectionModel().getSelectedItem(), 800) : null;
-
-    // if color ramp is not NONE, color the hillshade elevation raster instead of using satellite imagery raster color
-    RasterLayer rasterLayer = colorRamp != null ? new RasterLayer(new Raster(elevationRasterPath))
-        : new RasterLayer(new Raster(imageryRasterPath));
+    ColorRamp colorRamp;
+    // if the color ramp selection is none, don't apply a color ramp otherwise apply the selected color ramp
+    if (colorRampComboBox.getSelectionModel().getSelectedItem() == ColorRamp.PresetType.NONE) {
+      colorRamp = null;
+    } else {
+      colorRamp = new ColorRamp(colorRampComboBox.getSelectionModel().getSelectedItem(), 800);
+    }
 
+    // if color ramp is NONE, use the satellite imagery raster color instead of coloring the hillshade elevation raster
+    RasterLayer rasterLayer;
+    if (colorRamp == null) {
+      rasterLayer = new RasterLayer(new Raster(imageryRasterPath));
+    } else {
+      rasterLayer = new RasterLayer(new Raster(elevationRasterPath));
+    }
+    // set the basemap to the raster layer
     mapView.getMap().setBasemap(new Basemap(rasterLayer));
 
-    // create blend renderer
+    // create blend renderer and set it to the raster layer
     BlendRenderer blendRenderer = new BlendRenderer(new Raster(elevationRasterPath), Collections.singletonList(9.0),
-        Collections.singletonList(255.0), null, null, null, null, colorRamp, altitudeSlider.getValue(),
-        azimuthSlider.getValue(), 1, slopeTypeComboBox.getSelectionModel().getSelectedItem(), 1, 1, 8);
+      Collections.singletonList(255.0), null, null, null, null, colorRamp, altitudeSlider.getValue(),
+      azimuthSlider.getValue(), 1, slopeTypeComboBox.getSelectionModel().getSelectedItem(), 1, 1, 8);
 
     rasterLayer.setRasterRenderer(blendRenderer);
   }