New Basemaps: Local Server and Map View Categories (#606)

* Update LocalServerFeatureLayerSample.java

* Update LocalServerGeoprocessingController.java

* Update LocalServerMapImageLayerSample.java

* Update ChangeViewpointSample.java

* Update DisplayDeviceLocationWithAutopanModesSample.java

* Update DisplayDrawingStatusSample.java

* Update DisplayLayerViewStateSample.java

* Update IdentifyLayersSample.java

* Update MapRotationSample.java

* Update ScaleBarSample.java

* Update ShowLocationHistorySample.java

* Update TakeScreenshotSample.java

* Fix comments

* Scale bar - set viewpoint on mapview

* Identify layers - set viewpoint on mapview

* Display drawing status - reordering

* Display layer view state - tidy comments

* Identify layers - amend viewpoint

* Show location history - tidy comment

* update build.gradle - versions

* Tidy comment and scale consistencies

* Display drawing status - set viewpoint on map view

Co-authored-by: sclaridge <[email protected]>

Author: jenmerritt

local_server/local-server-feature-layer/build.gradle

@@ -6,7 +6,7 @@ plugins {
 group = 'com.esri.samples'
 
 ext {
-    arcgisVersion = '100.9.0'
+    arcgisVersion = '100.10.0-2992'
 }
 
 javafx {

local_server/local-server-feature-layer/src/main/java/com/esri/samples/local_server_feature_layer/LocalServerFeatureLayerSample.java

@@ -28,6 +28,7 @@
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 
+import com.esri.arcgisruntime.ArcGISRuntimeEnvironment;
 import com.esri.arcgisruntime.data.ServiceFeatureTable;
 import com.esri.arcgisruntime.geometry.Envelope;
 import com.esri.arcgisruntime.layers.FeatureLayer;
@@ -37,7 +38,7 @@
 import com.esri.arcgisruntime.localserver.LocalServerStatus;
 import com.esri.arcgisruntime.localserver.LocalService.StatusChangedEvent;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
-import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.BasemapStyle;
 import com.esri.arcgisruntime.mapping.Viewpoint;
 import com.esri.arcgisruntime.mapping.view.MapView;
 
@@ -66,8 +67,14 @@ public void start(Stage stage) {
       stage.setScene(scene);
       stage.show();
 
-      // create a view with a map and basemap
-      map = new ArcGISMap(Basemap.createStreets());
+      // authentication with an API key or named user is required to access basemaps and other location services
+      String yourAPIKey = System.getProperty("apiKey");
+      ArcGISRuntimeEnvironment.setApiKey(yourAPIKey);
+
+      // create a map with the streets basemap style
+      map = new ArcGISMap(BasemapStyle.ARCGIS_STREETS);
+
+      // create a map view and set the map to it
       mapView = new MapView();
       mapView.setMap(map);
 
@@ -101,7 +108,7 @@ public void start(Stage stage) {
         });
       }
 
-      // add view to application window
+      // add the map view and progress indicator to the stack pane
       stackPane.getChildren().addAll(mapView, featureLayerProgress);
       StackPane.setAlignment(featureLayerProgress, Pos.CENTER);
     } catch (Exception e) {

local_server/local-server-geoprocessing/build.gradle

@@ -6,7 +6,7 @@ plugins {
 group = 'com.esri.samples'
 
 ext {
-    arcgisVersion = '100.9.0'
+    arcgisVersion = '100.10.0-2992'
 }
 
 javafx {

local_server/local-server-geoprocessing/src/main/java/com/esri/samples/local_server_geoprocessing/LocalServerGeoprocessingController.java

@@ -27,6 +27,7 @@
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.TextField;
 
+import com.esri.arcgisruntime.ArcGISRuntimeEnvironment;
 import com.esri.arcgisruntime.concurrent.Job;
 import com.esri.arcgisruntime.data.TileCache;
 import com.esri.arcgisruntime.layers.ArcGISMapImageLayer;
@@ -37,7 +38,7 @@
 import com.esri.arcgisruntime.localserver.LocalServer;
 import com.esri.arcgisruntime.localserver.LocalServerStatus;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
-import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.BasemapStyle;
 import com.esri.arcgisruntime.mapping.view.MapView;
 import com.esri.arcgisruntime.tasks.geoprocessing.GeoprocessingDouble;
 import com.esri.arcgisruntime.tasks.geoprocessing.GeoprocessingJob;
@@ -65,8 +66,14 @@ public class LocalServerGeoprocessingController {
   public void initialize() {
 
     try {
-      // create a view with a map and basemap
-      ArcGISMap map = new ArcGISMap(Basemap.createLightGrayCanvas());
+      // authentication with an API key or named user is required to access basemaps and other location services
+      String yourAPIKey = System.getProperty("apiKey");
+      ArcGISRuntimeEnvironment.setApiKey(yourAPIKey);
+
+      // create a map with the light gray basemap style
+      ArcGISMap map = new ArcGISMap(BasemapStyle.ARCGIS_LIGHT_GRAY);
+
+      // set the map to the map view
       mapView.setMap(map);
 
       //load tiled layer and zoom to location

local_server/local-server-map-image-layer/build.gradle

@@ -6,7 +6,7 @@ plugins {
 group = 'com.esri.samples'
 
 ext {
-    arcgisVersion = '100.9.0'
+    arcgisVersion = '100.10.0-2992'
 }
 
 javafx {

local_server/local-server-map-image-layer/src/main/java/com/esri/samples/local_server_map_image_layer/LocalServerMapImageLayerSample.java

@@ -28,6 +28,7 @@
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 
+import com.esri.arcgisruntime.ArcGISRuntimeEnvironment;
 import com.esri.arcgisruntime.geometry.Envelope;
 import com.esri.arcgisruntime.layers.ArcGISMapImageLayer;
 import com.esri.arcgisruntime.loadable.LoadStatus;
@@ -36,7 +37,7 @@
 import com.esri.arcgisruntime.localserver.LocalServerStatus;
 import com.esri.arcgisruntime.localserver.LocalService.StatusChangedEvent;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
-import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.BasemapStyle;
 import com.esri.arcgisruntime.mapping.Viewpoint;
 import com.esri.arcgisruntime.mapping.view.MapView;
 
@@ -64,8 +65,14 @@ public void start(Stage stage) {
       stage.setScene(scene);
       stage.show();
 
-      // create a view with a map and basemap
-      ArcGISMap map = new ArcGISMap(Basemap.createStreets());
+      // authentication with an API key or named user is required to access basemaps and other location services
+      String yourAPIKey = System.getProperty("apiKey");
+      ArcGISRuntimeEnvironment.setApiKey(yourAPIKey);
+
+      // create a map with the streets basemap style
+      ArcGISMap map = new ArcGISMap(BasemapStyle.ARCGIS_STREETS);
+
+      // create a map view and set the map to it
       mapView = new MapView();
       mapView.setMap(map);
 
@@ -97,7 +104,7 @@ public void start(Stage stage) {
         });
       }
 
-      // add view to application window with progress bar
+      // add the map view and progress indicator to the stack pane
       stackPane.getChildren().addAll(mapView, imageLayerProgress);
       StackPane.setAlignment(imageLayerProgress, Pos.CENTER);
     } catch (Exception e) {

map_view/change-viewpoint/build.gradle

@@ -6,7 +6,7 @@ plugins {
 group = 'com.esri.samples'
 
 ext {
-    arcgisVersion = '100.9.0'
+    arcgisVersion = '100.10.0-2992'
 }
 
 javafx {

map_view/change-viewpoint/src/main/java/com/esri/samples/change_viewpoint/ChangeViewpointSample.java

@@ -29,13 +29,14 @@
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
 
+import com.esri.arcgisruntime.ArcGISRuntimeEnvironment;
 import com.esri.arcgisruntime.geometry.Point;
 import com.esri.arcgisruntime.geometry.PointCollection;
 import com.esri.arcgisruntime.geometry.Polyline;
 import com.esri.arcgisruntime.geometry.SpatialReference;
 import com.esri.arcgisruntime.geometry.SpatialReferences;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
-import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.BasemapStyle;
 import com.esri.arcgisruntime.mapping.Viewpoint;
 import com.esri.arcgisruntime.mapping.view.MapView;
 
@@ -62,6 +63,10 @@ public void start(Stage stage) {
       stage.setScene(scene);
       stage.show();
 
+      // authentication with an API key or named user is required to access basemaps and other location services
+      String yourAPIKey = System.getProperty("apiKey");
+      ArcGISRuntimeEnvironment.setApiKey(yourAPIKey);
+
       // create a control panel
       VBox controlsVBox = new VBox(6);
       controlsVBox.setBackground(new Background(new BackgroundFill(Paint.valueOf("rgba(0,0,0,0.3)"), CornerRadii.EMPTY,
@@ -111,10 +116,10 @@ public void start(Stage stage) {
       // add controls to the user interface panel
       controlsVBox.getChildren().addAll(animateButton, centerButton, geometryButton);
 
-      // create ArcGISMap with imagery basemap
-      ArcGISMap map = new ArcGISMap(Basemap.createImageryWithLabels());
+      // create a map with the imagery basemap style
+      ArcGISMap map = new ArcGISMap(BasemapStyle.ARCGIS_IMAGERY);
 
-      // create a view and set ArcGISMap to it
+      // create a map view and set the map to it
       mapView = new MapView();
       mapView.setMap(map);
 

map_view/display-device-location-with-autopan-modes/build.gradle

@@ -6,7 +6,7 @@ plugins {
 group = 'com.esri.samples'
 
 ext {
-    arcgisVersion = '100.10.0-2934'
+    arcgisVersion = '100.10.0-2992'
 }
 
 javafx {

map_view/display-device-location-with-autopan-modes/src/main/java/com/esri/samples/display_device_location_with_autopan_modes/DisplayDeviceLocationWithAutopanModesSample.java

@@ -36,14 +36,15 @@
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
 
+import com.esri.arcgisruntime.ArcGISRuntimeEnvironment;
 import com.esri.arcgisruntime.geometry.Geometry;
 import com.esri.arcgisruntime.geometry.Polyline;
 import com.esri.arcgisruntime.geometry.SpatialReferences;
 import com.esri.arcgisruntime.loadable.LoadStatus;
 import com.esri.arcgisruntime.location.SimulatedLocationDataSource;
 import com.esri.arcgisruntime.location.SimulationParameters;
 import com.esri.arcgisruntime.mapping.ArcGISMap;
-import com.esri.arcgisruntime.mapping.Basemap;
+import com.esri.arcgisruntime.mapping.BasemapStyle;
 import com.esri.arcgisruntime.mapping.view.LocationDisplay;
 import com.esri.arcgisruntime.mapping.view.MapView;
 
@@ -69,10 +70,14 @@ public void start(Stage stage) {
       stage.show();
       scene.getStylesheets().add(getClass().getResource("/display_device_location_with_autopan_modes/style.css").toExternalForm());
 
-      // create an ArcGISMap with the imagery basemap
-      ArcGISMap map = new ArcGISMap(Basemap.createImagery());
+      // authentication with an API key or named user is required to access basemaps and other location services
+      String yourAPIKey = System.getProperty("apiKey");
+      ArcGISRuntimeEnvironment.setApiKey(yourAPIKey);
 
-      // create a map view and add the map to it
+      // create a map with the standard imagery basemap style
+      ArcGISMap map = new ArcGISMap(BasemapStyle.ARCGIS_IMAGERY_STANDARD);
+
+      // create a map view and set the map to it
       mapView = new MapView();
       mapView.setMap(map);