Merge pull request #199 from Esri/dev

Release 100.2.0

Author: mbcoder

.gitignore

@@ -2,10 +2,14 @@
 bin/
 tmp/
 build/
+out/
 
 # Local configuration file (sdk path, etc)
 local.properties
 .gradle/
+/samples-data/
+/jniLibs/
+/resources/
 
 # Intellij project files
 *.ipr
@@ -33,6 +37,3 @@ local.properties
 .Trashes
 ehthumbs.db
 Thumbs.db
-/samples-data/
-/jniLibs/
-/resources/

README.md

@@ -1,5 +1,5 @@
 # ArcGIS Runtime Java SDK Samples
-### 100.1.0
+### 100.2.0
 This project includes a set of samples demonstrating how to accomplish various mapping and GIS tasks with the ArcGIS Runtime SDK for Java.
 
 These samples are built with Gradle. If you want to learn more about Gradle, learn more from [Gradle's guide](https://docs.gradle.org/current/userguide/userguide.html).
@@ -71,7 +71,7 @@ Esri welcomes contributions from anyone and everyone. Please see our [guidelines
 Find a bug or want a new feature? Please let us know by submitting an issue.
 
 ## Licensing
-Copyright 2016 Esri
+Copyright 2017 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not 
 use this file except in compliance with the License. You may obtain a copy 

build.gradle

@@ -14,7 +14,7 @@ buildscript {
     }
 }
 
-arcgis.version = '100.1.0'
+arcgis.version = '100.2.0'
 
 idea.module.downloadJavadoc = true
 eclipse.classpath.downloadJavadoc = true
@@ -23,7 +23,6 @@ compileJava.options.encoding = 'UTF-8'
 
 dependencies {
     compile 'commons-io:commons-io:2.4'
-    compile 'org.controlsfx:controlsfx:8.40.13'
     compile 'org.jooq:joox:1.4.0'
 }
 
@@ -50,7 +49,5 @@ run {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.0'
-}
-
-run.dependsOn downloadData
+    gradleVersion = '4.3.1'
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Thu Sep 29 13:58:52 PDT 2016
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -0,0 +1,148 @@
+/*
+ * Copyright 2017 Esri.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.esri.samples.analysis.line_of_sight_location;
+
+import java.util.concurrent.ExecutionException;
+
+import javafx.application.Application;
+import javafx.event.EventHandler;
+import javafx.geometry.Point2D;
+import javafx.scene.Scene;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
+import com.esri.arcgisruntime.concurrent.ListenableFuture;
+import com.esri.arcgisruntime.geoanalysis.LocationLineOfSight;
+import com.esri.arcgisruntime.geometry.Point;
+import com.esri.arcgisruntime.geometry.SpatialReferences;
+import com.esri.arcgisruntime.mapping.ArcGISScene;
+import com.esri.arcgisruntime.mapping.ArcGISTiledElevationSource;
+import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.Surface;
+import com.esri.arcgisruntime.mapping.view.AnalysisOverlay;
+import com.esri.arcgisruntime.mapping.view.Camera;
+import com.esri.arcgisruntime.mapping.view.SceneView;
+
+public class LineOfSightLocationSample extends Application {
+
+  private SceneView sceneView;
+
+  @Override
+  public void start(Stage stage) throws Exception {
+
+    try {
+
+      // create stack pane and JavaFX app scene
+      StackPane stackPane = new StackPane();
+      Scene fxScene = new Scene(stackPane);
+
+      // set title, size, and add JavaFX scene to stage
+      stage.setTitle("Line of Sight Location Sample");
+      stage.setWidth(800);
+      stage.setHeight(700);
+      stage.setScene(fxScene);
+      stage.show();
+
+      // create a scene and add a basemap to it
+      ArcGISScene scene = new ArcGISScene();
+      scene.setBasemap(Basemap.createTopographic());
+
+      // add the SceneView to the stack pane
+      sceneView = new SceneView();
+      sceneView.setArcGISScene(scene);
+      stackPane.getChildren().add(sceneView);
+
+      // add base surface for elevation data
+      Surface surface = new Surface();
+      surface.getElevationSources().add(new ArcGISTiledElevationSource( "http://elevation3d.arcgis" +
+          ".com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer"));
+      scene.setBaseSurface(surface);
+
+      // create an analysis overlay for the line of sight
+      AnalysisOverlay analysisOverlay = new AnalysisOverlay();
+      sceneView.getAnalysisOverlays().add(analysisOverlay);
+
+      // initialize a line of sight analysis and add it to the analysis overlay
+      Point observerLocation = new Point(-73.06958032962375,-49.253112971555446,2000, SpatialReferences.getWgs84());
+      Point targetLocation = new Point(-73.079266999709162, -49.300457676730559, 1312, SpatialReferences.getWgs84());
+      LocationLineOfSight lineOfSight = new LocationLineOfSight(observerLocation, targetLocation);
+      analysisOverlay.getAnalyses().add(lineOfSight);
+
+      // initialize the viewpoint
+      Camera camera = new Camera(new Point(-73.0815, -49.3272, 4059, SpatialReferences.getWgs84()), 11, 62, 0);
+      sceneView.setViewpointCamera(camera);
+
+      // remove default mouse move handler
+      sceneView.setOnMouseMoved(null);
+
+      // update the target location when the mouse moves
+      EventHandler<MouseEvent> mouseMoveEventHandler = event -> {
+        Point2D point2D = new Point2D(event.getX(), event.getY());
+        // get the scene location from the screen position
+        ListenableFuture<Point> pointFuture = sceneView.screenToLocationAsync(point2D);
+        pointFuture.addDoneListener(() -> {
+          try {
+            Point point = pointFuture.get();
+            // update the target location
+            lineOfSight.setTargetLocation(point);
+          } catch (InterruptedException | ExecutionException e) {
+            e.printStackTrace();
+          }
+        });
+      };
+
+      // mouse click to start/stop moving target location
+      sceneView.setOnMouseClicked(event -> {
+        if (event.isStillSincePress() && event.getButton() == MouseButton.PRIMARY) {
+          if (sceneView.getOnMouseMoved() == null) {
+            sceneView.setOnMouseMoved(mouseMoveEventHandler);
+          } else {
+            sceneView.setOnMouseMoved(null);
+          }
+        }
+      });
+
+    } catch (Exception e) {
+      // on any error, display the stack trace.
+      e.printStackTrace();
+    }
+  }
+
+  /**
+   * Stops and releases all resources used in application.
+   */
+  @Override
+  public void stop() {
+
+    if (sceneView != null) {
+      sceneView.dispose();
+    }
+  }
+
+  /**
+   * Opens and runs application.
+   *
+   * @param args arguments passed to this application
+   */
+  public static void main(String[] args) {
+
+    Application.launch(args);
+  }
+
+}

src/main/java/com/esri/samples/analysis/line_of_sight_location/LineOfSightLocation.gif

@@ -0,0 +1,35 @@
+<h1>Line of Sight Location</h1>
+
+<p>Demonstrates how to update a line of sight on-the-fly with the mouse.</p>
+
+<h2>How to use the sample</h2>
+
+<p>Click to turn on the mouse move event listener. Then move the mouse where you want the target location to be. 
+Click again to lock the target location.</p>
+
+<p><img src="LineOfSightLocation.gif"/></p>
+
+<h2>How it works</h2>
+
+<p>To create a line of sight and update it with the mouse:</p>
+
+<ol>
+  <li>Create an <code>AnalysisOverlay</code> and add it to the scene view.</li>
+  <li>Create a <code>LocationLineOfSight</code> with initial observer and target locations and add it to the analysis
+   overlay.</li>
+  <li>Make an <code>EventHandler&lt;MouseEvent&gt;</code> to capture mouse movement. Turn the screen point into a scene 
+  point with <code>sceneView.screenToLocationAsync(screenPoint)</code>.</li>
+  <li>Update the target location with <code>lineOfSight.setTargetLocation(scenePoint)</code>.</li>
+</ol>
+
+<h2>Features</h2>
+
+<ul>
+  <li>3D</li>
+  <li>AnalysisOverlay</li>
+  <li>ArcGISTiledElevationSource</li>
+  <li>ArcGISScene</li>
+  <li>Camera</li>
+  <li>LocationLineOfSight</li>
+  <li>SceneView</li>
+</ul>