diff --git a/.classpath b/.classpath index fca9db7..59861d7 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -34,5 +34,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index 935b005..70a76a0 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,9 @@ + + Added location and zoom support [ticket #11708] + Added coordinates EPSG:4326 and EPSG:3857 support [ticket + #11710] + Updated to support StorageHub properties [ticket #11720] diff --git a/pom.xml b/pom.xml index 2a3c415..17311eb 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user data-miner-manager - 1.9.1-SNAPSHOT + 1.10.0-SNAPSHOT war data-miner-manager @@ -80,17 +80,6 @@ 2.4.0 - @@ -190,19 +179,6 @@ - - org.gcube.common diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/WKTFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/WKTFld.java index 7424d7a..6c88786 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/WKTFld.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/WKTFld.java @@ -11,6 +11,7 @@ import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaD import org.gcube.portlets.widgets.openlayerbasicwidgets.client.event.SelectAreaDialogEvent.SelectAreaDialogEventHandler; import org.gcube.portlets.widgets.openlayerbasicwidgets.client.widgets.AreaSelectionDialog; import org.gcube.portlets.widgets.openlayerbasicwidgets.client.widgets.GeometryType; +import org.gcube.portlets.widgets.openlayerbasicwidgets.shared.data.Coordinates; import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.shared.GWT; @@ -119,6 +120,16 @@ public class WKTFld extends AbstractFld { } } + private Coordinates getCoordinates() { + Coordinates coordinates = null; + if (wktParameter != null && wktParameter.getCoordinates() != null) { + coordinates = new Coordinates(wktParameter.getCoordinates().getProjection(), + wktParameter.getCoordinates().getX(), wktParameter.getCoordinates().getY(), + wktParameter.getCoordinates().getZoom()); + } + return coordinates; + } + private void drawAGeometry() { SelectAreaDialogEventHandler handler = new SelectAreaDialogEventHandler() { @@ -145,7 +156,9 @@ public class WKTFld extends AbstractFld { } }; - areaSelectionDialog = new AreaSelectionDialog(getGeometryType()); + GeometryType geometryType = getGeometryType(); + Coordinates coordinates = getCoordinates(); + areaSelectionDialog = new AreaSelectionDialog(geometryType, coordinates); areaSelectionDialog.setZIndex(XDOM.getTopZIndex()); areaSelectionDialog.addSelectAreaDialogEventHandler(handler); areaSelectionDialog.show();