Update geopackage sample (#374)

* patch-closest-facility-static-readme (#363)

* delete sample calculate distance 3D (#365)

* Patch/ClosestFacilityStatic- Edit readme 'how to use' (#364)

* patch oAuth sample custom challengehandler (#366)

* implement fix for javafx webengine

* formatting

* add fix for create and save map sample

* markdown to html formatting

* update read geopackage design

* update readme code snippets

* improve comments

* remove unneeded comments

* comment wording

* implement review corrections

* whitespace

* remove unrelated files

* implement review changes

* remove css stylesheet

* clean up some comments

Author: JonLavi

map/read-geopackage/README.md

@@ -1,31 +1,41 @@
-# Read GeoPackage
+# Read a GeoPackage
 
-Display rasters and features from local GeoPackages.
+Add rasters and feature tables from a GeoPackage to a map.
 
-![](ReadGeoPackage.png)
+![](ReadGeoPackage.jpg)
+
+## Use case
+
+The OGC GeoPackage specification defines an open standard for sharing raster and vector data. You may want to use GeoPackage files to support file-based sharing of geographic data.
 
 ## How to use the sample
 
-The layers in the geoPackage, which have not been added to the map are shown in the bottom list. Click an item to show it as a layer in the map. Layers in the map are listed in the top list. Click layers from the top list to remove them from the map.
+When the sample loads, the feature layers and rasters from the GeoPackage will be shown on the map.
 
 ## How it works
 
-To read layers from a geoPackage and show them in a map:
-
-1. Create a `GeoPackage` with the path to the local geoPackage file.
-2. Load the `GeoPackage` with `GeoPackage.loadAsync`.
-3. Create raster layers for each of these with `new RasterLayer(geoPackageRaster)`.
-4. Add each layer to the map as an operational layer with `map.getOperationalLayers().add(layer)`.
-5. When it's done loading, get the `GeoPackageFeatureTable`s inside with `geoPackage.getGeoPackageFeatureTables()`.
-6. For each feature table, create a feature layer with `new FeatureLayer(featureTable)`.
-7. You can also get the `GeoPackageRaster`s inside using `GeoPackage.getGeoPackageRasters()`.
+1. Get the GeoPackage and load it using `geoPackage.loadAsync()`.
+2. Iterate through available rasters, exposed by `geopackage.getGeoPackageRasters()`. For each raster, create a raster layer using `new RasterLayer(geopackageRaster)`, then add it to the map.
+3. Iterate through available feature tables, exposed by `geopackage.getGeoPackageFeatureTables()`. For each feature table, create a feature layer using `new FeatureLayer(geopackageFeatureTable)`, then add it to the map.
 
 ## Relevant API
 
-* ArcGISMap
-* Basemap
-* FeatureLayer
 * GeoPackage
-* Layer
-* MapView
-* RasterLayer
+* GeoPackageRaster
+* GeoPackageFeatureTable
+
+## Offline data
+
+Find this item on [ArcGIS Online](https://arcgisruntime.maps.arcgis.com/home/item.html?id=68ec42517cdd439e81b036210483e8e7).
+
+## About the data
+
+This sample features a GeoPackage with datasets that cover Aurora, Colorado: Public art (points), Bike trails (lines), Subdivisions (polygons), Airport noise (raster), and liquour license density (raster).
+
+## Additional information
+
+GeoPackage uses a single SQLite file (.gpkg) that conforms to the OGC GeoPackage Standard. You can create a GeoPackage file (.gpkg) from your own data using the create a SQLite Database tool in ArcGIS Pro.
+
+## Tags
+
+container, layers, maps, OGC, package, rasters, tables

map/read-geopackage/src/main/java/com/esri/samples/read_geopackage/ReadGeoPackageSample.java

@@ -19,26 +19,15 @@
 import java.io.File;
 
 import javafx.application.Application;
-import javafx.geometry.Insets;
-import javafx.geometry.Pos;
 import javafx.scene.Scene;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.input.MouseButton;
-import javafx.scene.layout.Background;
-import javafx.scene.layout.BackgroundFill;
-import javafx.scene.layout.CornerRadii;
+import javafx.scene.control.Alert;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
-import javafx.util.Callback;
 
 import com.esri.arcgisruntime.data.GeoPackage;
 import com.esri.arcgisruntime.layers.FeatureLayer;
-import com.esri.arcgisruntime.layers.Layer;
 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;
@@ -54,7 +43,6 @@ public void start(Stage stage) {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Read GeoPackage Sample");
@@ -68,108 +56,35 @@ public void start(Stage stage) {
       mapView = new MapView();
       mapView.setMap(map);
 
-      // create two list views, one showing the layers in the map,
-      // the other, showing the layers in the geoPackage not yet added to the map
-      ListView<Layer> mapLayers = new ListView<>();
-      ListView<Layer> geoPackageLayers = new ListView<>();
-
-      // create labels for the lists
-      Label mapLayersLabel = new Label("Map layers");
-      Label geoPackageLayersLabel = new Label("GeoPackage layers (not in the map)");
-      mapLayersLabel.getStyleClass().add("panel-label");
-      geoPackageLayersLabel.getStyleClass().add("panel-label");
-
-      // 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,
-          Insets.EMPTY)));
-      controlsVBox.setPadding(new Insets(10.0));
-      controlsVBox.setMaxSize(250, 260);
-      controlsVBox.getStyleClass().add("panel-region");
-
-      // add labels and lists to the control panel
-      controlsVBox.getChildren().addAll(mapLayersLabel, mapLayers, geoPackageLayersLabel, geoPackageLayers);
-
-      // create a cell factory to show the layer names in the list view
-      Callback<ListView<Layer>, ListCell<Layer>> cellFactory = list -> new ListCell<Layer>() {
-
-        @Override
-        protected void updateItem(Layer layer, boolean bln) {
-
-          super.updateItem(layer, bln);
-          if (layer != null) {
-            if (layer instanceof FeatureLayer) {
-              FeatureLayer featureLayer = (FeatureLayer) layer;
-              setText(featureLayer.getName());
-            } else if (layer instanceof RasterLayer) {
-              RasterLayer rasterLayer = (RasterLayer) layer;
-              // use the raster file name if the raster layer name is empty
-              String path = rasterLayer.getRaster().getPath();
-              setText(rasterLayer.getName().isEmpty() ? path.substring(path.lastIndexOf('/') + 1) : rasterLayer.getName());
-            }
-          } else {
-            setText(null);
-          }
-        }
-
-      };
-
-      mapLayers.setCellFactory(cellFactory);
-      geoPackageLayers.setCellFactory(cellFactory);
-
-      // when you click on a layer in the geopackage layers list view, add it to the map
-      geoPackageLayers.setOnMouseClicked(e -> {
-        if (e.isStillSincePress() && e.getButton() == MouseButton.PRIMARY) {
-          // get selected layer
-          Layer layer = geoPackageLayers.getSelectionModel().getSelectedItem();
-          if (layer != null) {
-            // add it to the map and the top of the map layers list
-            map.getOperationalLayers().add(layer);
-            mapLayers.getItems().add(0, layer);
-            // remove it from the geoPackage layers list
-            geoPackageLayers.getItems().remove(layer);
-          }
-        }
-      });
-
-      // when you click on a layer in the map layers list view, remove it from the map
-      mapLayers.setOnMouseClicked(e -> {
-        if (e.isStillSincePress() && e.getButton() == MouseButton.PRIMARY) {
-          // get selected layer
-          Layer layer = mapLayers.getSelectionModel().getSelectedItem();
-          if (layer != null) {
-            // remove it from the map and the map layers list
-            map.getOperationalLayers().remove(layer);
-            mapLayers.getItems().remove(layer);
-            // add it back to the geoPackage layers list
-            geoPackageLayers.getItems().add(layer);
-          }
-        }
-      });
-
-      // read the raster and feature layers from the geoPackage and show them in the list view
+      // load the local GeoPackage
       File geoPackageFile = new File("./samples-data/auroraCO/AuroraCO.gpkg");
       GeoPackage geoPackage = new GeoPackage(geoPackageFile.getAbsolutePath());
       geoPackage.loadAsync();
       geoPackage.addDoneLoadingListener(() -> {
-        geoPackage.getGeoPackageRasters().forEach(raster -> {
-          RasterLayer rasterLayer = new RasterLayer(raster);
-          rasterLayer.loadAsync();
-          // make the raster layer semi-transparent so we can see layers below it
-          rasterLayer.setOpacity(0.5f);
-          geoPackageLayers.getItems().add(rasterLayer);
-        });
-        geoPackage.getGeoPackageFeatureTables().forEach(table -> {
-          FeatureLayer featureLayer = new FeatureLayer(table);
-          featureLayer.loadAsync();
-          geoPackageLayers.getItems().add(featureLayer);
-        });
+        if (geoPackage.getLoadStatus() == LoadStatus.LOADED) {
+          // add raster layers from the rasters in the GeoPackage
+          geoPackage.getGeoPackageRasters().forEach(raster -> {
+            RasterLayer rasterLayer = new RasterLayer(raster);
+            // make the layer semi-transparent to see through it
+            rasterLayer.setOpacity(0.5f);
+
+            map.getOperationalLayers().add(rasterLayer);
+          });
+
+          // add feature layers from the feature tables in the GeoPackage
+          geoPackage.getGeoPackageFeatureTables().forEach(table -> {
+            FeatureLayer featureLayer = new FeatureLayer(table);
+
+            map.getOperationalLayers().add(featureLayer);
+          });
+        } else {
+          new Alert(Alert.AlertType.ERROR, "GeoPackage failed to load").show();
+        }
       });
 
-      // add the map view and control box to stack pane
-      stackPane.getChildren().addAll(mapView, controlsVBox);
-      StackPane.setAlignment(controlsVBox, Pos.TOP_LEFT);
-      StackPane.setMargin(controlsVBox, new Insets(10, 0, 0, 10));
+      // add the map view to the stack pane
+      stackPane.getChildren().add(mapView);
+
     } catch (Exception e) {
       // on any error, display the stack trace
       e.printStackTrace();
@@ -197,4 +112,4 @@ public static void main(String[] args) {
     Application.launch(args);
   }
 
-}
+}