Merge branch 'dev' into 100.3.0

Author: tschie

src/main/java/com/esri/samples/featurelayers/feature_layer_extrusion/FeatureLayerExtrusion.gif

@@ -77,8 +77,8 @@ public void start(Stage stage) throws Exception {
     SimpleLineSymbol lineSymbol = new SimpleLineSymbol(SimpleLineSymbol.Style.SOLID, 0xFF000000, 1.0f);
     SimpleFillSymbol fillSymbol = new SimpleFillSymbol(SimpleFillSymbol.Style.SOLID, 0xFF0000FF, lineSymbol);
     final SimpleRenderer renderer = new SimpleRenderer(fillSymbol);
-    //  need to set an extrusion type, BASE HEIGHT extrudes each point from feature individually
-    renderer.getSceneProperties().setExtrusionMode(Renderer.SceneProperties.ExtrusionMode.BASE_HEIGHT);
+    // set the extrusion mode to absolute height
+    renderer.getSceneProperties().setExtrusionMode(Renderer.SceneProperties.ExtrusionMode.ABSOLUTE_HEIGHT);
     statesFeatureLayer.setRenderer(renderer);
 
     // set camera to focus on state features
@@ -98,13 +98,13 @@ public void start(Stage stage) throws Exception {
     Button extrusionButton = new Button("Population Density");
     extrusionButton.setOnAction(v -> {
       if (showTotalPopulation) {
-        // some feature's population is really big of need to sink it down
+        // scale down outlier populations
         renderer.getSceneProperties().setExtrusionExpression("[POP2007]/ 10");
         extrusionButton.setText("Population Density");
         showTotalPopulation = false;
       } else {
-        // density of population is a small value to need to increase it
-        renderer.getSceneProperties().setExtrusionExpression("[POP07_SQMI] * 5000");
+        // scale up density
+        renderer.getSceneProperties().setExtrusionExpression("[POP07_SQMI] * 5000 + 100000");
         extrusionButton.setText("Total Population");
         showTotalPopulation = true;
       }

src/main/java/com/esri/samples/featurelayers/feature_layer_extrusion/FeatureLayerExtrusion.png

@@ -90,7 +90,7 @@ public void start(Stage stage) throws Exception {
       // set renderer with extrusion property
       SimpleRenderer renderer = new SimpleRenderer();
       SceneProperties renderProperties = renderer.getSceneProperties();
-      renderProperties.setExtrusionMode(SceneProperties.ExtrusionMode.BASE_HEIGHT);
+      renderProperties.setExtrusionMode(SceneProperties.ExtrusionMode.ABSOLUTE_HEIGHT);
       renderProperties.setExtrusionExpression("[HEIGHT]");
       graphicsOverlay.setRenderer(renderer);
 

src/main/java/com/esri/samples/featurelayers/feature_layer_extrusion/FeatureLayerExtrusionSample.java

@@ -16,8 +16,7 @@
 <ol>
   <li>Create a <code>GraphicsOverlay</code> and <code>SimpleRenderer</code>.</li>
   <li>Get the renderer's <code>SceneProperties</code> using <code>Renderer.getSceneProperties()</code>.</li>
-  <li>Set the extrusion mode for the renderer with <code>SceneProperties.setExtrusionMode(ExtrusionMode)</code>.
-    <ul><li>BASE_HEIGHT, graphic is extruded to various z-values</li></ul></li>
+  <li>Set the extrusion mode for the renderer with <code>SceneProperties.setExtrusionMode(ExtrusionMode)</code>.</li>
   <li>Specify the attribute name of the graphic that the extrusion mode will use, <code>SceneProperties
   .setExtrusionExpression("[HEIGHT]")</code>.</li>
   <li>Set the renderer on the graphics overlay, <code>GraphicsOverlay.setRenderer(Renderer)</code>.</li>

src/main/java/com/esri/samples/scene/extrude_graphics/ExtrudeGraphics.png

@@ -1,8 +1,8 @@
-<h1>Scene Layer Select</h1>
+<h1>Scene Layer Selection</h1>
 
 <p>This sample demonstrates how to select geoelements in a scene layer.</p>
 
-<p><img src="SceneLayerSelect.png"></p>
+<p><img src="SceneLayerSelection.png"></p>
 
 <h2>How to use the sample</h2>
 

src/main/java/com/esri/samples/scene/extrude_graphics/ExtrudeGraphicsSample.java

@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.esri.samples.scene.scene_layer_select;
+package com.esri.samples.scene.scene_layer_selection;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -36,11 +36,11 @@
 import com.esri.arcgisruntime.mapping.Basemap;
 import com.esri.arcgisruntime.mapping.GeoElement;
 import com.esri.arcgisruntime.mapping.Surface;
-import com.esri.arcgisruntime.mapping.Viewpoint;
+import com.esri.arcgisruntime.mapping.view.Camera;
 import com.esri.arcgisruntime.mapping.view.IdentifyLayerResult;
 import com.esri.arcgisruntime.mapping.view.SceneView;
 
-public class SceneLayerSelectSample extends Application {
+public class SceneLayerSelectionSample extends Application {
 
   private SceneView sceneView;
 
@@ -54,7 +54,7 @@ public void start(Stage stage) throws Exception {
       Scene fxScene = new Scene(stackPane);
 
       // set title, size, and add JavaFX scene to stage
-      stage.setTitle("Scene Layer Select Sample");
+      stage.setTitle("Scene Layer Selection Sample");
       stage.setWidth(800);
       stage.setHeight(700);
       stage.setScene(fxScene);
@@ -68,6 +68,10 @@ public void start(Stage stage) throws Exception {
       sceneView = new SceneView();
       sceneView.setArcGISScene(scene);
 
+      // set the initial viewpoint
+      Camera camera = new Camera(48.378, -4.494, 200, 345, 65, 0);
+      sceneView.setViewpointCamera(camera);
+
       // add the scene view to the stack pane
       stackPane.getChildren().add(sceneView);
 
@@ -77,15 +81,14 @@ public void start(Stage stage) throws Exception {
       surface.getElevationSources().add(new ArcGISTiledElevationSource(elevationService));
       scene.setBaseSurface(surface);
 
-      // add a scene layer of Harvard buildings to the scene
-      final String buildings = "https://tiles.arcgis.com/tiles/N82JbI5EYtAkuUKU/arcgis/rest/services/Buildings_Harvard/SceneServer";
+      // add a scene layer of buildings in Brest, France
+      final String buildings = "http://tiles.arcgis.com/tiles/P3ePLMYs2RVChkJx/arcgis/rest/services/Buildings_Brest/SceneServer/layers/0";
       ArcGISSceneLayer sceneLayer = new ArcGISSceneLayer(buildings);
       scene.getOperationalLayers().add(sceneLayer);
 
       // zoom to the layer's extent when loaded
       sceneLayer.addDoneLoadingListener(() -> {
         if (sceneLayer.getLoadStatus() == LoadStatus.LOADED) {
-          sceneView.setViewpoint(new Viewpoint(sceneLayer.getFullExtent()));
 
           // when the scene is clicked, identify the clicked feature and select it
           sceneView.setOnMouseClicked(e -> {