diff --git a/worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.html b/worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.html
index 4c8de092..7056940b 100644
--- a/worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.html
+++ b/worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.html
@@ -39,8 +39,7 @@
-
-
+
diff --git a/worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.java b/worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.java
index 3fedf57e..6ca002ac 100644
--- a/worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.java
+++ b/worldwind-gs-geopkg/src/main/java/gov/nasa/worldwind/gs/geopkg/web/ExportGeoPackagePage.java
@@ -52,10 +52,13 @@
import com.google.common.collect.Lists;
import gov.nasa.worldwind.geopkg.wps.GeoPackageProcessRequest.TilesLayer.TilesCoverage;
+import java.awt.Color;
import java.util.Arrays;
import java.util.Comparator;
import javax.xml.namespace.QName;
-import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.model.ResourceModel;
+import org.geoserver.web.data.store.panel.ColorPickerPanel;
+import org.geoserver.web.util.MapModel;
import org.geoserver.web.wicket.ColorPickerField;
/**
@@ -64,6 +67,8 @@
*/
public class ExportGeoPackagePage extends GeoServerSecuredPage {
+ private static final long serialVersionUID = 1L;
+
//choices in dropdown box
private static final List FORMATS = Arrays.asList(new String[]{
"image/vnd.jpeg-png", "image/jpeg", "image/png"});
@@ -76,8 +81,11 @@ public class ExportGeoPackagePage extends GeoServerSecuredPage {
TextField styles;
TextField tilesetName;
TextField filename;
+ TextField bgcolor;
+ final ColorPickerPanel bgColorPanel;
final BBoxPanel latLonPanel;
final CoveragePanel coveragePanel;
+ String bgColor = "";
/**
* Default constructor
@@ -90,8 +98,10 @@ public ExportGeoPackagePage() {
Form form = new Form("form");
add(form);
+ // Create a mandatory drop down to select the input layer
layerChoice = initLayersDropDown("layer", form);
+ //
styles = new TextField<>("styles", new Model("raster")); // HACH until a style selection is implemented
form.add(styles);
@@ -110,38 +120,44 @@ public ExportGeoPackagePage() {
form.add(new TextField<>("identifier", new PropertyModel<>(tilesLayer, "identifier")));
form.add(new TextField<>("desc", new PropertyModel<>(tilesLayer, "description")));
- DropDownChoice formats = new DropDownChoice("mimeType",
+ // Create an optional drop down for the GeoPackage tile image format
+ DropDownChoice formats = new DropDownChoice("mimeType",
new PropertyModel<>(tilesLayer, "format"), FORMATS);
form.add(formats);
-
-// form.add(new ColorPickerField("bkgdColor", new PropertyModel<>(tilesLayer, "bgColor")));
- TextField